From 32e755d2fc359929c3b5695dbfd15287f4084940 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Mon, 9 Feb 2015 16:11:26 +0100
Subject: [PATCH] Lint issues

---
 .../ChooseThemeReleaseNoteFragment.java       |   2 +-
 .../calculator/wizard/WizardActivity.java     |   2 +-
 .../calculator/wizard/WizardFragment.java     |  10 +-
 .../layout-land/main_first_pane_mobile.xml    |  73 ++---
 .../src/main/res/layout/about_fragment.xml    |  22 +-
 android-app/src/main/res/layout/ad.xml        |   4 +-
 android-app/src/main/res/layout/admob.xml     |  12 +-
 .../src/main/res/layout/calc_plot_view.xml    |  10 +-
 .../main/res/layout/cpp_activity_settings.xml |   6 +-
 .../main/res/layout/cpp_activity_wizard.xml   |  18 +-
 .../src/main/res/layout/cpp_app_button_0.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_1.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_2.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_3.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_4.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_5.xml  |  19 +-
 .../src/main/res/layout/cpp_app_button_6.xml  |  21 +-
 .../src/main/res/layout/cpp_app_button_7.xml  |  21 +-
 .../src/main/res/layout/cpp_app_button_8.xml  |  21 +-
 .../src/main/res/layout/cpp_app_button_9.xml  |  21 +-
 .../main/res/layout/cpp_app_button_clear.xml  |  19 +-
 .../main/res/layout/cpp_app_button_copy.xml   |   9 +-
 .../res/layout/cpp_app_button_division.xml    |  19 +-
 .../main/res/layout/cpp_app_button_donate.xml |   9 +-
 .../main/res/layout/cpp_app_button_dot.xml    |  17 +-
 .../main/res/layout/cpp_app_button_empty.xml  |   2 +-
 .../main/res/layout/cpp_app_button_equals.xml |  19 +-
 .../layout/cpp_app_button_equals_no_bg.xml    |   9 +-
 .../main/res/layout/cpp_app_button_erase.xml  |   9 +-
 .../res/layout/cpp_app_button_functions.xml   |  19 +-
 .../res/layout/cpp_app_button_history.xml     |  19 +-
 .../main/res/layout/cpp_app_button_left.xml   |  17 +-
 .../main/res/layout/cpp_app_button_minus.xml  |  17 +-
 .../layout/cpp_app_button_multiplication.xml  |  21 +-
 .../res/layout/cpp_app_button_operators.xml   |  11 +-
 .../main/res/layout/cpp_app_button_paste.xml  |   9 +-
 .../main/res/layout/cpp_app_button_plus.xml   |  19 +-
 .../main/res/layout/cpp_app_button_right.xml  |  17 +-
 .../layout/cpp_app_button_round_brackets.xml  |  21 +-
 .../main/res/layout/cpp_app_button_vars.xml   |  19 +-
 .../src/main/res/layout/cpp_app_display.xml   |  17 +-
 .../res/layout/cpp_app_display_mobile.xml     |  16 +-
 .../src/main/res/layout/cpp_app_editor.xml    |  24 +-
 .../main/res/layout/cpp_app_editor_mobile.xml |  24 +-
 .../src/main/res/layout/cpp_app_keyboard.xml  |  86 +++---
 .../res/layout/cpp_app_keyboard_mobile.xml    |  86 +++---
 .../src/main/res/layout/cpp_dialog.xml        |   8 +-
 .../main/res/layout/cpp_dialog_fragment.xml   |  54 ++--
 .../layout/cpp_fixable_messages_dialog.xml    |  36 +--
 .../cpp_fixable_messages_dialog_message.xml   |  30 +-
 .../src/main/res/layout/cpp_plot_fragment.xml |  20 +-
 .../layout/cpp_plot_function_list_item.xml    |  46 +--
 .../cpp_plot_function_settings_dialog.xml     |   6 +-
 .../cpp_plot_function_settings_fragment.xml   |  78 ++---
 .../layout/cpp_plot_functions_fragment.xml    |  52 ++--
 .../res/layout/cpp_plot_range_fragment.xml    | 128 ++++-----
 .../layout/cpp_purchase_dialog_fragment.xml   |  34 +--
 .../main/res/layout/cpp_release_note_step.xml |  12 +-
 .../main/res/layout/cpp_simple_button_0.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_1.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_2.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_3.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_4.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_5.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_6.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_7.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_8.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_9.xml   |   8 +-
 .../main/res/layout/cpp_simple_button_app.xml |  10 +-
 .../res/layout/cpp_simple_button_clear.xml    |  10 +-
 .../res/layout/cpp_simple_button_copy.xml     |  10 +-
 .../res/layout/cpp_simple_button_division.xml |   8 +-
 .../main/res/layout/cpp_simple_button_dot.xml |   8 +-
 .../res/layout/cpp_simple_button_equals.xml   |   8 +-
 .../res/layout/cpp_simple_button_erase.xml    |  10 +-
 .../layout/cpp_simple_button_functions.xml    |  10 +-
 .../res/layout/cpp_simple_button_history.xml  |  10 +-
 .../res/layout/cpp_simple_button_left.xml     |   8 +-
 .../res/layout/cpp_simple_button_like.xml     |  10 +-
 .../cpp_simple_button_multiplication.xml      |   8 +-
 .../layout/cpp_simple_button_operators.xml    |  10 +-
 .../res/layout/cpp_simple_button_paste.xml    |  10 +-
 .../res/layout/cpp_simple_button_percent.xml  |   8 +-
 .../res/layout/cpp_simple_button_plus.xml     |   8 +-
 .../res/layout/cpp_simple_button_power.xml    |   8 +-
 .../res/layout/cpp_simple_button_right.xml    |   8 +-
 .../cpp_simple_button_round_brackets.xml      |   8 +-
 .../res/layout/cpp_simple_button_settings.xml |  10 +-
 .../layout/cpp_simple_button_subtraction.xml  |   8 +-
 .../res/layout/cpp_simple_button_vars.xml     |  10 +-
 .../main/res/layout/cpp_simple_keyboard.xml   |  96 +++----
 .../layout/cpp_simple_keyboard_lockscreen.xml |  78 ++---
 ...p_simple_keyboard_lockscreen_collapsed.xml |  60 ++--
 .../main/res/layout/cpp_unit_converter.xml    | 112 ++++----
 .../src/main/res/layout/cpp_wiki_page.xml     |  13 +-
 .../src/main/res/layout/cpp_wizard.xml        |  22 +-
 .../layout/cpp_wizard_step_choose_layout.xml  |  19 +-
 .../layout/cpp_wizard_step_choose_mode.xml    |  32 +--
 .../layout/cpp_wizard_step_choose_theme.xml   |  21 +-
 .../cpp_wizard_step_choose_theme_preview.xml  |  10 +-
 .../layout/cpp_wizard_step_drag_button.xml    |  30 +-
 .../main/res/layout/cpp_wizard_step_final.xml |  12 +-
 .../res/layout/cpp_wizard_step_onscreen.xml   |  14 +-
 .../main/res/layout/display_error_message.xml |  26 +-
 android-app/src/main/res/layout/feedback.xml  |  14 +-
 .../src/main/res/layout/fragment_wizard.xml   |  10 +-
 .../res/layout/fragment_wizard_buttons.xml    |  13 +-
 .../main/res/layout/function_add_param.xml    |  22 +-
 .../src/main/res/layout/function_edit.xml     | 124 ++++----
 .../main/res/layout/function_edit_param.xml   |  48 ++--
 .../src/main/res/layout/history_edit.xml      |  68 ++---
 .../src/main/res/layout/history_item.xml      |  41 +--
 .../src/main/res/layout/main_calculator.xml   |   3 +-
 .../res/layout/main_calculator_mobile.xml     |  56 ++--
 .../src/main/res/layout/main_empty.xml        |   8 +-
 .../main/res/layout/main_empty_multi_pane.xml |   8 +-
 .../src/main/res/layout/math_entity.xml       |  44 +--
 .../main/res/layout/matrix_edit_fragment.xml  |  72 ++---
 .../res/layout/matrix_edit_fragment_item.xml  |  12 +-
 .../src/main/res/layout/notespp_announce.xml  |  14 +-
 .../src/main/res/layout/onscreen_display.xml  |  16 +-
 .../src/main/res/layout/onscreen_editor.xml   |  18 +-
 .../src/main/res/layout/onscreen_footer.xml   |   6 +-
 .../src/main/res/layout/onscreen_header.xml   |  48 ++--
 .../src/main/res/layout/onscreen_keyboard.xml |  70 ++---
 .../src/main/res/layout/onscreen_layout.xml   |  56 ++--
 .../res/layout/release_notes_fragment.xml     |  20 +-
 .../main/res/layout/saved_history_item.xml    |  18 +-
 android-app/src/main/res/layout/tabs.xml      |  26 +-
 android-app/src/main/res/layout/var_edit.xml  | 118 ++++----
 .../src/main/res/layout/widget_display.xml    |  14 +-
 .../src/main/res/layout/widget_editor.xml     |  24 +-
 .../src/main/res/layout/widget_layout.xml     |  48 ++--
 .../res/layout/widget_layout_lockscreen.xml   |  26 +-
 .../widget_layout_lockscreen_collapsed.xml    |  40 +--
 .../src/main/res/values-de/strings.xml        |   8 -
 .../src/main/res/values-es/strings.xml        |   8 -
 .../src/main/res/values-es/text_wizard.xml    |   1 +
 .../src/main/res/values-fr/strings.xml        |   8 -
 .../src/main/res/values-it/strings.xml        |   8 -
 .../src/main/res/values-pl/strings.xml        |   8 -
 .../src/main/res/values-pt-rBR/strings.xml    |   8 -
 .../src/main/res/values-pt-rbr/text_about.xml |  25 --
 .../main/res/values-pt-rbr/text_functions.xml |  36 ---
 .../main/res/values-pt-rbr/text_operators.xml |  17 --
 .../res/values-pt-rbr/text_preferences.xml    |  17 --
 .../main/res/values-pt-rbr/text_strings.xml   | 266 ------------------
 .../src/main/res/values-pt-rbr/text_vars.xml  |  17 --
 .../main/res/values-pt-rbr/text_wizard.xml    |  36 ---
 .../src/main/res/values-ru/strings.xml        |  22 --
 .../src/main/res/values-ru/text_strings.xml   |   2 +
 .../src/main/res/values-ru/text_wizard.xml    |   8 +-
 .../src/main/res/values-uk/strings.xml        |   8 -
 android-app/src/main/res/values/strings.xml   |  14 -
 .../src/main/res/values/text_strings.xml      |   5 +
 .../src/main/res/values/text_wizard.xml       |  60 ++--
 156 files changed, 1757 insertions(+), 2168 deletions(-)
 delete mode 100644 android-app/src/main/res/values-de/strings.xml
 delete mode 100644 android-app/src/main/res/values-es/strings.xml
 delete mode 100644 android-app/src/main/res/values-fr/strings.xml
 delete mode 100644 android-app/src/main/res/values-it/strings.xml
 delete mode 100644 android-app/src/main/res/values-pl/strings.xml
 delete mode 100644 android-app/src/main/res/values-pt-rBR/strings.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_about.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_functions.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_operators.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_preferences.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_strings.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_vars.xml
 delete mode 100644 android-app/src/main/res/values-pt-rbr/text_wizard.xml
 delete mode 100644 android-app/src/main/res/values-ru/strings.xml
 delete mode 100644 android-app/src/main/res/values-uk/strings.xml
 delete mode 100644 android-app/src/main/res/values/strings.xml

diff --git a/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
index 51aa99a9..cd1bacc9 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/release/ChooseThemeReleaseNoteFragment.java
@@ -13,6 +13,6 @@ public class ChooseThemeReleaseNoteFragment extends ChooseThemeWizardStep {
 		super.onViewCreated(root, savedInstanceState);
 
 		final TextView title = (TextView) root.findViewById(R.id.wizard_theme_title);
-		title.setText(R.string.release_notes_choose_theme);
+		title.setText(R.string.cpp_release_notes_choose_theme);
 	}
 }
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
index a8700784..d4fa9d83 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
@@ -120,7 +120,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
 			}
 
 			final AlertDialog.Builder b = new AlertDialog.Builder(this);
-			b.setTitle(getString(R.string.wizard_finish_confirmation_title)).
+			b.setTitle(getString(R.string.cpp_wizard_finish_confirmation_title)).
 					setMessage(R.string.cpp_wizard_finish_confirmation).
 					setNegativeButton(R.string.c_no, dialogListener).
 					setPositiveButton(R.string.c_yes, dialogListener).
diff --git a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java
index de6fc3ab..68efe17c 100644
--- a/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/wizard/WizardFragment.java
@@ -79,19 +79,19 @@ public abstract class WizardFragment extends Fragment implements View.OnClickLis
 		final boolean firstTimeWizard = TextUtils.equals(wizard.getName(), CalculatorWizards.FIRST_TIME_WIZARD);
 		if (canGoNext) {
 			if (canGoPrev || !firstTimeWizard) {
-				setupNextButton(R.string.acl_wizard_next);
+				setupNextButton(R.string.cpp_wizard_next);
 			} else {
-				setupNextButton(R.string.acl_wizard_start);
+				setupNextButton(R.string.cpp_wizard_start);
 			}
 		} else {
-			setupNextButton(R.string.acl_wizard_finish);
+			setupNextButton(R.string.cpp_wizard_finish);
 		}
 
 		if (canGoPrev) {
-			setupPrevButton(R.string.acl_wizard_back);
+			setupPrevButton(R.string.cpp_wizard_back);
 		} else {
 			if (firstTimeWizard) {
-				setupPrevButton(R.string.wizard_skip);
+				setupPrevButton(R.string.cpp_wizard_skip);
 			}
 		}
 
diff --git a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
index 29c3c845..fccd98f0 100644
--- a/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
+++ b/android-app/src/main/res/layout-land/main_first_pane_mobile.xml
@@ -22,59 +22,62 @@
   ~ Site:  http://se.solovyev.org
   -->
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical"
-			  a:layout_gravity="center">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:layout_gravity="center"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:id="@+id/editorContainer"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:id="@+id/editorContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="2"
+		a:orientation="horizontal" />
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1"
+		a:baselineAligned="false">
 
 		<include
-				layout="@layout/cpp_app_button_left"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
+			layout="@layout/cpp_app_button_left"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<include
-				layout="@layout/cpp_app_button_erase"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
+			layout="@layout/cpp_app_button_erase"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<FrameLayout
-				a:id="@+id/displayContainer"
-				a:layout_height="match_parent"
-				a:layout_width="0dp"
-				a:layout_weight="4"/>
+			a:id="@+id/displayContainer"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="4" />
 
 		<include
-				layout="@layout/cpp_app_button_clear"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
+			layout="@layout/cpp_app_button_clear"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<include
-				layout="@layout/cpp_app_button_right"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:layout_weight="1"/>
+			layout="@layout/cpp_app_button_right"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:id="@+id/keyboardContainer"
-			a:layout_weight="3"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		a:id="@+id/keyboardContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="3"
+		a:orientation="horizontal" />
 
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/about_fragment.xml b/android-app/src/main/res/layout/about_fragment.xml
index 9fed2e3b..70c36a89 100644
--- a/android-app/src/main/res/layout/about_fragment.xml
+++ b/android-app/src/main/res/layout/about_fragment.xml
@@ -23,9 +23,9 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:orientation="vertical"
 	a:layout_width="fill_parent"
-	a:layout_height="fill_parent">
+	a:layout_height="fill_parent"
+	a:orientation="vertical">
 
 	<ImageView
 		a:layout_width="wrap_content"
@@ -47,27 +47,27 @@
 
 			<TextView
 				a:id="@+id/cpp_about_textview"
-				a:text="@string/c_about_content"
-				a:layout_height="match_parent"
+				style="@style/CppText.About"
 				a:layout_width="match_parent"
-				style="@style/CppText.About" />
+				a:layout_height="match_parent"
+				a:text="@string/c_about_content" />
 
 
 			<TextView
 				a:id="@+id/cpp_about_translators_text"
-				a:text="@string/cpp_translators_text"
-				a:layout_height="wrap_content"
+				style="@style/CppText.About"
 				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
 				a:paddingBottom="0dp"
-				style="@style/CppText.About" />
+				a:text="@string/cpp_translators_text" />
 
 			<TextView
 				a:id="@+id/cpp_about_translators"
-				a:text="@string/cpp_translators_list"
-				a:layout_height="wrap_content"
+				style="@style/CppText.About"
 				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
 				a:paddingTop="0dp"
-				style="@style/CppText.About" />
+				a:text="@string/cpp_translators_list" />
 
 		</LinearLayout>
 	</ScrollView>
diff --git a/android-app/src/main/res/layout/ad.xml b/android-app/src/main/res/layout/ad.xml
index f59ae650..8be65613 100644
--- a/android-app/src/main/res/layout/ad.xml
+++ b/android-app/src/main/res/layout/ad.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.AdView xmlns:a="http://schemas.android.com/apk/res/android"
-	a:id="@+id/ad"
+<org.solovyev.android.calculator.AdView a:id="@+id/ad"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="wrap_content"
 	a:layout_gravity="center"
diff --git a/android-app/src/main/res/layout/admob.xml b/android-app/src/main/res/layout/admob.xml
index bf8c0a09..7770a82f 100644
--- a/android-app/src/main/res/layout/admob.xml
+++ b/android-app/src/main/res/layout/admob.xml
@@ -22,12 +22,12 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<com.google.android.gms.ads.AdView xmlns:a="http://schemas.android.com/apk/res/android"
+<com.google.android.gms.ads.AdView a:id="@+id/admob"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	xmlns:ads="http://schemas.android.com/apk/res-auto"
-	a:id="@+id/admob"
 	a:layout_width="match_parent"
 	a:layout_height="wrap_content"
-    a:layout_gravity="center"
-    ads:adSize="BANNER"
-    a:visibility="gone"
-    ads:adUnitId="@string/admob" />
+	a:layout_gravity="center"
+	a:visibility="gone"
+	ads:adSize="BANNER"
+	ads:adUnitId="@string/admob" />
diff --git a/android-app/src/main/res/layout/calc_plot_view.xml b/android-app/src/main/res/layout/calc_plot_view.xml
index 6ea70a99..a425745d 100644
--- a/android-app/src/main/res/layout/calc_plot_view.xml
+++ b/android-app/src/main/res/layout/calc_plot_view.xml
@@ -22,11 +22,11 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/plot_view_container"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent">
+<LinearLayout a:id="@+id/plot_view_container"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent"
+	a:orientation="vertical">
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_activity_settings.xml b/android-app/src/main/res/layout/cpp_activity_settings.xml
index a184ad6b..500591c2 100644
--- a/android-app/src/main/res/layout/cpp_activity_settings.xml
+++ b/android-app/src/main/res/layout/cpp_activity_settings.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
 	<android.support.v7.widget.Toolbar
 		android:id="@+id/action_bar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:minHeight="?attr/actionBarSize"
-		app:theme="?attr/cpp_toolbar_theme"/>
+		app:theme="?attr/cpp_toolbar_theme" />
 
 	<FrameLayout
 		android:id="@+id/content_wrapper"
diff --git a/android-app/src/main/res/layout/cpp_activity_wizard.xml b/android-app/src/main/res/layout/cpp_activity_wizard.xml
index c71eb733..5102fa6e 100644
--- a/android-app/src/main/res/layout/cpp_activity_wizard.xml
+++ b/android-app/src/main/res/layout/cpp_activity_wizard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout style="@style/MaterialActivity"
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:my="http://schemas.android.com/apk/res-auto"
-	style="@style/MaterialActivity"
-	android:padding="0dp"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:padding="0dp">
 
 	<android.support.v4.view.ViewPager
 		android:id="@+id/pager"
@@ -12,12 +12,12 @@
 		android:layout_weight="1" />
 
 	<com.viewpagerindicator.CirclePageIndicator
-		android:paddingTop="10dp"
-		android:paddingBottom="10dp"
 		android:id="@+id/pager_indicator"
-		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
-		my:radius="5dp"
-		my:fillColor="?attr/colorAccent"/>
+		android:layout_height="wrap_content"
+		android:paddingBottom="10dp"
+		android:paddingTop="10dp"
+		my:fillColor="?attr/colorAccent"
+		my:radius="5dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_0.xml b/android-app/src/main/res/layout/cpp_app_button_0.xml
index 78169b15..6e4125d0 100644
--- a/android-app/src/main/res/layout/cpp_app_button_0.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_0.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_0"
-													c:textUp="00"
-													a:text="0"
-													c:textDown="000"
-													c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_0"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="0"
+	c:directionTextScale="0.5"
+	c:textDown="000"
+	c:textUp="00"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_1.xml b/android-app/src/main/res/layout/cpp_app_button_1.xml
index 64731c97..c5d40e64 100644
--- a/android-app/src/main/res/layout/cpp_app_button_1.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_1.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_1"
-													a:text="1"
-													c:textUp="sin"
-													c:textLeft="A"
-													c:textDown="asin"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_1"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="1"
+	c:textDown="asin"
+	c:textLeft="A"
+	c:textUp="sin"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_2.xml b/android-app/src/main/res/layout/cpp_app_button_2.xml
index 9404148d..412e0b6a 100644
--- a/android-app/src/main/res/layout/cpp_app_button_2.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_2.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_2"
-													a:text="2"
-													c:textUp="cos"
-													c:textLeft="B"
-													c:textDown="acos"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_2"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="2"
+	c:textDown="acos"
+	c:textLeft="B"
+	c:textUp="cos"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_3.xml b/android-app/src/main/res/layout/cpp_app_button_3.xml
index b56b7bf4..fb3a5ecf 100644
--- a/android-app/src/main/res/layout/cpp_app_button_3.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_3.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_3"
-													a:text="3"
-													c:textUp="tan"
-													c:textLeft="C"
-													c:textDown="atan"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_3"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="3"
+	c:textDown="atan"
+	c:textLeft="C"
+	c:textUp="tan"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_4.xml b/android-app/src/main/res/layout/cpp_app_button_4.xml
index 7e222325..d1e6367f 100644
--- a/android-app/src/main/res/layout/cpp_app_button_4.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_4.xml
@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_4"
-													a:text="4"
-													c:textUp="x"
-													c:textLeft="D"
-													c:textDown="y"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_4"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="4"
+	c:textDown="y"
+	c:textLeft="D"
+	c:textUp="x"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_5.xml b/android-app/src/main/res/layout/cpp_app_button_5.xml
index 6696b00e..abceb96f 100644
--- a/android-app/src/main/res/layout/cpp_app_button_5.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_5.xml
@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_5"
-													a:text="5"
-													c:textUp="t"
-													c:textLeft="E"
-													c:textDown="j"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_5"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="5"
+	c:textDown="j"
+	c:textLeft="E"
+	c:textUp="t"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_6.xml b/android-app/src/main/res/layout/cpp_app_button_6.xml
index 8edf82f9..2cec491f 100644
--- a/android-app/src/main/res/layout/cpp_app_button_6.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_6.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.view.AngleUnitsButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:c="http://schemas.android.com/apk/res-auto"
-													   c:textUp="deg"
-													   a:id="@id/cpp_button_6"
-													   a:text="6"
-													   c:textLeft="F"
-													   c:textDown="rad"
-													   c:directionTextScale="0.33;0.30;0.33;0.33"
-													   style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.view.AngleUnitsButton
+	a:id="@id/cpp_button_6"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="6"
+	c:directionTextScale="0.33;0.30;0.33;0.33"
+	c:textDown="rad"
+	c:textLeft="F"
+	c:textUp="deg"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_7.xml b/android-app/src/main/res/layout/cpp_app_button_7.xml
index 4654e753..824f17a4 100644
--- a/android-app/src/main/res/layout/cpp_app_button_7.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_7.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_7"
-													a:text="7"
-													c:textUp="i"
-													c:textLeft="0b:"
-													c:textDown="!"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_7"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="7"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
+	c:textDown="!"
+	c:textLeft="0b:"
+	c:textUp="i"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_8.xml b/android-app/src/main/res/layout/cpp_app_button_8.xml
index 2dea06ed..935dfd61 100644
--- a/android-app/src/main/res/layout/cpp_app_button_8.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_8.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_8"
-													a:text="8"
-													c:textUp="ln"
-													c:textLeft="0d:"
-													c:textDown="lg"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_8"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="8"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
+	c:textDown="lg"
+	c:textLeft="0d:"
+	c:textUp="ln"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_9.xml b/android-app/src/main/res/layout/cpp_app_button_9.xml
index 00c1aec5..c60a1492 100644
--- a/android-app/src/main/res/layout/cpp_app_button_9.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_9.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_9"
-													a:text="9"
-													c:textDown="e"
-													c:textLeft="0x:"
-													c:textUp="π"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_9"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="9"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
+	c:textDown="e"
+	c:textLeft="0x:"
+	c:textUp="π"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_clear.xml b/android-app/src/main/res/layout/cpp_app_button_clear.xml
index 406853fa..954e70ff 100644
--- a/android-app/src/main/res/layout/cpp_app_button_clear.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_clear.xml
@@ -22,12 +22,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.view.NumeralBasesButton xmlns:a="http://schemas.android.com/apk/res/android"
-														 xmlns:c="http://schemas.android.com/apk/res-auto"
-														 a:id="@id/cpp_button_clear"
-														 c:textUp="dec"
-														 a:text="@string/c_clear"
-														 c:textDown="bin"
-														 c:textLeft="hex"
-														 a:textStyle="bold"
-														 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
+<org.solovyev.android.calculator.view.NumeralBasesButton
+	a:id="@id/cpp_button_clear"
+	style="?attr/cpp_button_style_control_image"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	a:text="@string/c_clear"
+	a:textStyle="bold"
+	c:textDown="bin"
+	c:textLeft="hex"
+	c:textUp="dec" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_copy.xml b/android-app/src/main/res/layout/cpp_app_button_copy.xml
index 4001d448..5891e61d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_copy.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_copy.xml
@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_copy"
-			 a:src="@drawable/kb_copy"
-			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
+<ImageButton
+	a:id="@id/cpp_button_copy"
+	style="?attr/cpp_button_style_control_image"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:src="@drawable/kb_copy" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_division.xml b/android-app/src/main/res/layout/cpp_app_button_division.xml
index 81e7deba..d8c04ee3 100644
--- a/android-app/src/main/res/layout/cpp_app_button_division.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_division.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_division"
-													c:textUp="%"
-													a:text="/"
-													c:textDown="√"
-													c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_division"
+	style="?attr/cpp_button_style_operation"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="/"
+	c:directionTextScale="0.5"
+	c:textDown="√"
+	c:textUp="%"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_donate.xml b/android-app/src/main/res/layout/cpp_app_button_donate.xml
index b2f8c90d..2f7bedbe 100644
--- a/android-app/src/main/res/layout/cpp_app_button_donate.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_donate.xml
@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_share"
-			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
+<ImageButton
+	a:id="@id/cpp_button_like"
+	style="?attr/cpp_button_style_control_image"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:src="@drawable/kb_share" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_dot.xml b/android-app/src/main/res/layout/cpp_app_button_dot.xml
index 1db91357..24ecde50 100644
--- a/android-app/src/main/res/layout/cpp_app_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_dot.xml
@@ -22,10 +22,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_period"
-													a:text="."
-													c:textUp=","
-													c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_period"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="."
+	c:directionTextScale="0.5"
+	c:textUp=","
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_empty.xml b/android-app/src/main/res/layout/cpp_app_button_empty.xml
index d37328e8..b9f9c21d 100644
--- a/android-app/src/main/res/layout/cpp_app_button_empty.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_empty.xml
@@ -21,4 +21,4 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton style="?attr/cpp_button_style_control" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_equals.xml b/android-app/src/main/res/layout/cpp_app_button_equals.xml
index 615c3d9e..15934ba8 100644
--- a/android-app/src/main/res/layout/cpp_app_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_equals.xml
@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_equals"
-													c:textUp="≡"
-													a:text="="
-													c:textDown="@string/cpp_plot_button_text"
-													c:directionTextScale="0.5;0.5;0.33;0.5"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_equals"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="="
+	c:directionTextScale="0.5;0.5;0.33;0.5"
+	c:textDown="@string/cpp_plot_button_text"
+	c:textUp="≡"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml b/android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml
index 6f7b84d7..d0e1975b 100644
--- a/android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_equals_no_bg.xml
@@ -21,14 +21,17 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton a:id="@id/cpp_button_equals"
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_equals"
 	style="?attr/cpp_button_style_control"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:background="@drawable/button_no_bg"
 	a:text="="
 	a:textColor="?android:attr/textColorPrimary"
 	c:directionTextColor="?android:attr/textColorPrimary"
 	c:directionTextScale="0.5;0.5;0.33;0.5"
 	c:textDown="@string/cpp_plot_button_text"
-	a:background="@drawable/button_no_bg"
-	c:textUp="≡" />
\ No newline at end of file
+	c:textUp="≡"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_erase.xml b/android-app/src/main/res/layout/cpp_app_button_erase.xml
index 351938ec..92d5e850 100644
--- a/android-app/src/main/res/layout/cpp_app_button_erase.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_erase.xml
@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_erase"
-			 a:src="@drawable/kb_erase"
-			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
+<ImageButton
+	a:id="@id/cpp_button_erase"
+	style="?attr/cpp_button_style_control_image"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:src="@drawable/kb_erase" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_functions.xml b/android-app/src/main/res/layout/cpp_app_button_functions.xml
index c2cf5977..b0910b5e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_functions.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_functions.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_functions"
-													c:directionTextScale="0.4"
-													c:textUp="+ƒ"
-													a:text="ƒ(x)"
-													a:textStyle="italic"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_functions"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="ƒ(x)"
+	a:textStyle="italic"
+	c:directionTextScale="0.4"
+	c:textUp="+ƒ"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_history.xml b/android-app/src/main/res/layout/cpp_app_button_history.xml
index 795b853f..24bc56fa 100644
--- a/android-app/src/main/res/layout/cpp_app_button_history.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_history.xml
@@ -21,12 +21,13 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_history"
-													a:text="@string/c_history_button"
-													c:textUp="@string/c_undo"
-													c:textDown="@string/c_redo"
-													c:directionTextScale="0.27"
-													style="?attr/cpp_button_style_control"
-													a:textStyle="bold"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_history"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	a:text="@string/c_history_button"
+	a:textStyle="bold"
+	c:directionTextScale="0.27"
+	c:textDown="@string/c_redo"
+	c:textUp="@string/c_undo" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_left.xml b/android-app/src/main/res/layout/cpp_app_button_left.xml
index 366ed24b..7b647308 100644
--- a/android-app/src/main/res/layout/cpp_app_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_left.xml
@@ -22,10 +22,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_left"
-													c:textUp="◁◁"
-													a:text="◁"
-													c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_left"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="◁"
+	c:directionTextScale="0.5"
+	c:textUp="◁◁"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_minus.xml b/android-app/src/main/res/layout/cpp_app_button_minus.xml
index a002ace1..18e327e5 100644
--- a/android-app/src/main/res/layout/cpp_app_button_minus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_minus.xml
@@ -21,10 +21,13 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_subtraction"
-													c:textDown="∂,…"
-													a:text="-"
-													c:directionTextScale="0.4"
-													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_subtraction"
+	style="?attr/cpp_button_style_operation"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="−"
+	c:directionTextScale="0.4"
+	c:textDown="∂,…"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
index 5b796e09..79839521 100644
--- a/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_multiplication.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_multiplication"
-													a:text="×"
-													c:textUp="^"
-													c:textDown="^2"
-													c:textLeft="Π"
-													style="?attr/cpp_button_style_operation"
-													c:directionTextScale="0.5"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_multiplication"
+	style="?attr/cpp_button_style_operation"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="×"
+	c:directionTextScale="0.5"
+	c:textDown="^2"
+	c:textLeft="Π"
+	c:textUp="^"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_operators.xml b/android-app/src/main/res/layout/cpp_app_button_operators.xml
index ddfb85aa..b196cbd1 100644
--- a/android-app/src/main/res/layout/cpp_app_button_operators.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_operators.xml
@@ -22,7 +22,10 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													a:id="@id/cpp_button_operators"
-													a:text="∂,…"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_operators"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="∂,…"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_paste.xml b/android-app/src/main/res/layout/cpp_app_button_paste.xml
index 46eada43..3ac8c32e 100644
--- a/android-app/src/main/res/layout/cpp_app_button_paste.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_paste.xml
@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_paste"
-			 a:src="@drawable/kb_paste"
-			 style="?attr/cpp_button_style_control_image"/>
\ No newline at end of file
+<ImageButton
+	a:id="@id/cpp_button_paste"
+	style="?attr/cpp_button_style_control_image"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:src="@drawable/kb_paste" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_plus.xml b/android-app/src/main/res/layout/cpp_app_button_plus.xml
index 8e325228..7cd3ccf6 100644
--- a/android-app/src/main/res/layout/cpp_app_button_plus.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_plus.xml
@@ -21,11 +21,14 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_plus"
-													c:directionTextScale="0.5"
-													c:textUp="°"
-													c:textDown="E"
-													a:text="+"
-													style="?attr/cpp_button_style_operation"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_plus"
+	style="?attr/cpp_button_style_operation"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="+"
+	c:directionTextScale="0.5"
+	c:textDown="E"
+	c:textUp="°"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_right.xml b/android-app/src/main/res/layout/cpp_app_button_right.xml
index e8a44f7e..8db1df8a 100644
--- a/android-app/src/main/res/layout/cpp_app_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_right.xml
@@ -22,10 +22,13 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_right"
-													c:textUp="▷▷"
-													a:text="▷"
-													c:directionTextScale="0.5"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_right"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="▷"
+	c:directionTextScale="0.5"
+	c:textUp="▷▷"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
index eddb52dd..c9a0bad3 100644
--- a/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_round_brackets.xml
@@ -22,12 +22,15 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_round_brackets"
-													c:textUp="("
-													a:text="( )"
-													c:textDown=")"
-													c:textLeft="(…)"
-													c:directionTextScale="0.5;0.5;0.5;0.33"
-													style="?attr/cpp_button_style_digit"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_round_brackets"
+	style="?attr/cpp_button_style_digit"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="( )"
+	c:directionTextScale="0.5;0.5;0.5;0.33"
+	c:textDown=")"
+	c:textLeft="(…)"
+	c:textUp="("
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_button_vars.xml b/android-app/src/main/res/layout/cpp_app_button_vars.xml
index f57b82b9..015021e8 100644
--- a/android-app/src/main/res/layout/cpp_app_button_vars.xml
+++ b/android-app/src/main/res/layout/cpp_app_button_vars.xml
@@ -22,11 +22,14 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.drag.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													xmlns:c="http://schemas.android.com/apk/res-auto"
-													a:id="@id/cpp_button_vars"
-													c:directionTextScale="0.4"
-													c:textUp="+π"
-													a:text="π,…"
-													a:textStyle="italic"
-													style="?attr/cpp_button_style_control"/>
\ No newline at end of file
+<org.solovyev.android.calculator.drag.DirectionDragButton
+	a:id="@id/cpp_button_vars"
+	style="?attr/cpp_button_style_control"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:c="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	a:text="π,…"
+	a:textStyle="italic"
+	c:directionTextScale="0.4"
+	c:textUp="+π"
+	tools:ignore="HardcodedText" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_display.xml b/android-app/src/main/res/layout/cpp_app_display.xml
index ebbd962e..d5784cae 100644
--- a/android-app/src/main/res/layout/cpp_app_display.xml
+++ b/android-app/src/main/res/layout/cpp_app_display.xml
@@ -22,11 +22,12 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
-															  a:id="@+id/calculator_display"
-															  style="@style/CppText.Display"
-															  a:padding="@dimen/cpp_display_padding"
-															  a:inputType="textMultiLine"
-															  a:maxLines="3"
-															  a:scrollHorizontally="false"
-															  a:scrollbars="none"/>
\ No newline at end of file
+<org.solovyev.android.calculator.AndroidCalculatorDisplayView
+	a:id="@+id/calculator_display"
+	style="@style/CppText.Display"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:inputType="textMultiLine"
+	a:maxLines="3"
+	a:padding="@dimen/cpp_display_padding"
+	a:scrollHorizontally="false"
+	a:scrollbars="none" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_display_mobile.xml b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
index ebbd962e..e2bf4179 100644
--- a/android-app/src/main/res/layout/cpp_app_display_mobile.xml
+++ b/android-app/src/main/res/layout/cpp_app_display_mobile.xml
@@ -22,11 +22,11 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
-															  a:id="@+id/calculator_display"
-															  style="@style/CppText.Display"
-															  a:padding="@dimen/cpp_display_padding"
-															  a:inputType="textMultiLine"
-															  a:maxLines="3"
-															  a:scrollHorizontally="false"
-															  a:scrollbars="none"/>
\ No newline at end of file
+<org.solovyev.android.calculator.AndroidCalculatorDisplayView a:id="@+id/calculator_display"
+	style="@style/CppText.Display"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:inputType="textMultiLine"
+	a:maxLines="3"
+	a:padding="@dimen/cpp_display_padding"
+	a:scrollHorizontally="false"
+	a:scrollbars="none" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_editor.xml b/android-app/src/main/res/layout/cpp_app_editor.xml
index 23ac6fd9..e89248da 100644
--- a/android-app/src/main/res/layout/cpp_app_editor.xml
+++ b/android-app/src/main/res/layout/cpp_app_editor.xml
@@ -22,19 +22,19 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:padding="@dimen/cpp_editor_padding">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:padding="@dimen/cpp_editor_padding">
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
-			a:id="@+id/calculator_editor"
-			style="@style/CppText.Editor"
-			a:textIsSelectable="true"
-			a:singleLine="false"
-			a:scrollbars="vertical"
-			a:hint="@string/c_calc_editor_hint"/>
+		a:id="@+id/calculator_editor"
+		style="@style/CppText.Editor"
+		a:hint="@string/c_calc_editor_hint"
+		a:scrollbars="vertical"
+		a:singleLine="false"
+		a:textIsSelectable="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_editor_mobile.xml b/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
index b6d18512..9d2c7ebf 100644
--- a/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
+++ b/android-app/src/main/res/layout/cpp_app_editor_mobile.xml
@@ -22,19 +22,19 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:padding="@dimen/cpp_editor_padding">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:padding="@dimen/cpp_editor_padding">
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
-			a:id="@+id/calculator_editor"
-			style="@style/CppText.Editor.Mobile"
-			a:textIsSelectable="true"
-			a:singleLine="false"
-			a:scrollbars="vertical"
-			a:hint="@string/c_calc_editor_hint"/>
+		a:id="@+id/calculator_editor"
+		style="@style/CppText.Editor.Mobile"
+		a:hint="@string/c_calc_editor_hint"
+		a:scrollbars="vertical"
+		a:singleLine="false"
+		a:textIsSelectable="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_app_keyboard.xml b/android-app/src/main/res/layout/cpp_app_keyboard.xml
index 4f3ce878..02c57213 100644
--- a/android-app/src/main/res/layout/cpp_app_keyboard.xml
+++ b/android-app/src/main/res/layout/cpp_app_keyboard.xml
@@ -23,93 +23,93 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_7"/>
+		<include layout="@layout/cpp_app_button_7" />
 
-		<include layout="@layout/cpp_app_button_8"/>
+		<include layout="@layout/cpp_app_button_8" />
 
-		<include layout="@layout/cpp_app_button_9"/>
+		<include layout="@layout/cpp_app_button_9" />
 
-		<include layout="@layout/cpp_app_button_multiplication"/>
+		<include layout="@layout/cpp_app_button_multiplication" />
 
-		<include layout="@layout/cpp_app_button_clear"/>
+		<include layout="@layout/cpp_app_button_clear" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_4"/>
+		<include layout="@layout/cpp_app_button_4" />
 
-		<include layout="@layout/cpp_app_button_5"/>
+		<include layout="@layout/cpp_app_button_5" />
 
-		<include layout="@layout/cpp_app_button_6"/>
+		<include layout="@layout/cpp_app_button_6" />
 
-		<include layout="@layout/cpp_app_button_division"/>
+		<include layout="@layout/cpp_app_button_division" />
 
-		<include layout="@layout/cpp_app_button_erase"/>
+		<include layout="@layout/cpp_app_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_1"/>
+		<include layout="@layout/cpp_app_button_1" />
 
-		<include layout="@layout/cpp_app_button_2"/>
+		<include layout="@layout/cpp_app_button_2" />
 
-		<include layout="@layout/cpp_app_button_3"/>
+		<include layout="@layout/cpp_app_button_3" />
 
-		<include layout="@layout/cpp_app_button_plus"/>
+		<include layout="@layout/cpp_app_button_plus" />
 
-		<include layout="@layout/cpp_app_button_copy"/>
+		<include layout="@layout/cpp_app_button_copy" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_round_brackets"/>
+		<include layout="@layout/cpp_app_button_round_brackets" />
 
-		<include layout="@layout/cpp_app_button_0"/>
+		<include layout="@layout/cpp_app_button_0" />
 
-		<include layout="@layout/cpp_app_button_dot"/>
+		<include layout="@layout/cpp_app_button_dot" />
 
-		<include layout="@layout/cpp_app_button_minus"/>
+		<include layout="@layout/cpp_app_button_minus" />
 
-		<include layout="@layout/cpp_app_button_paste"/>
+		<include layout="@layout/cpp_app_button_paste" />
 
 	</LinearLayout>
 
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_left"/>
+		<include layout="@layout/cpp_app_button_left" />
 
-		<include layout="@layout/cpp_app_button_right"/>
+		<include layout="@layout/cpp_app_button_right" />
 
-		<include layout="@layout/cpp_app_button_vars"/>
+		<include layout="@layout/cpp_app_button_vars" />
 
-		<include layout="@layout/cpp_app_button_functions"/>
+		<include layout="@layout/cpp_app_button_functions" />
 
-		<include layout="@layout/cpp_app_button_history"/>
+		<include layout="@layout/cpp_app_button_history" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml b/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
index 4f3ce878..02c57213 100644
--- a/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
+++ b/android-app/src/main/res/layout/cpp_app_keyboard_mobile.xml
@@ -23,93 +23,93 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_7"/>
+		<include layout="@layout/cpp_app_button_7" />
 
-		<include layout="@layout/cpp_app_button_8"/>
+		<include layout="@layout/cpp_app_button_8" />
 
-		<include layout="@layout/cpp_app_button_9"/>
+		<include layout="@layout/cpp_app_button_9" />
 
-		<include layout="@layout/cpp_app_button_multiplication"/>
+		<include layout="@layout/cpp_app_button_multiplication" />
 
-		<include layout="@layout/cpp_app_button_clear"/>
+		<include layout="@layout/cpp_app_button_clear" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_4"/>
+		<include layout="@layout/cpp_app_button_4" />
 
-		<include layout="@layout/cpp_app_button_5"/>
+		<include layout="@layout/cpp_app_button_5" />
 
-		<include layout="@layout/cpp_app_button_6"/>
+		<include layout="@layout/cpp_app_button_6" />
 
-		<include layout="@layout/cpp_app_button_division"/>
+		<include layout="@layout/cpp_app_button_division" />
 
-		<include layout="@layout/cpp_app_button_erase"/>
+		<include layout="@layout/cpp_app_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_1"/>
+		<include layout="@layout/cpp_app_button_1" />
 
-		<include layout="@layout/cpp_app_button_2"/>
+		<include layout="@layout/cpp_app_button_2" />
 
-		<include layout="@layout/cpp_app_button_3"/>
+		<include layout="@layout/cpp_app_button_3" />
 
-		<include layout="@layout/cpp_app_button_plus"/>
+		<include layout="@layout/cpp_app_button_plus" />
 
-		<include layout="@layout/cpp_app_button_copy"/>
+		<include layout="@layout/cpp_app_button_copy" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_round_brackets"/>
+		<include layout="@layout/cpp_app_button_round_brackets" />
 
-		<include layout="@layout/cpp_app_button_0"/>
+		<include layout="@layout/cpp_app_button_0" />
 
-		<include layout="@layout/cpp_app_button_dot"/>
+		<include layout="@layout/cpp_app_button_dot" />
 
-		<include layout="@layout/cpp_app_button_minus"/>
+		<include layout="@layout/cpp_app_button_minus" />
 
-		<include layout="@layout/cpp_app_button_paste"/>
+		<include layout="@layout/cpp_app_button_paste" />
 
 	</LinearLayout>
 
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_app_button_left"/>
+		<include layout="@layout/cpp_app_button_left" />
 
-		<include layout="@layout/cpp_app_button_right"/>
+		<include layout="@layout/cpp_app_button_right" />
 
-		<include layout="@layout/cpp_app_button_vars"/>
+		<include layout="@layout/cpp_app_button_vars" />
 
-		<include layout="@layout/cpp_app_button_functions"/>
+		<include layout="@layout/cpp_app_button_functions" />
 
-		<include layout="@layout/cpp_app_button_history"/>
+		<include layout="@layout/cpp_app_button_history" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_dialog.xml b/android-app/src/main/res/layout/cpp_dialog.xml
index 1b1e65c9..68099d7a 100644
--- a/android-app/src/main/res/layout/cpp_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_dialog.xml
@@ -22,9 +22,9 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/dialog_layout"
-			  style="@style/CppDialog"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/dialog_layout"
+	style="@style/CppDialog"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
index fbd5bfa6..ea5c6c1b 100644
--- a/android-app/src/main/res/layout/cpp_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_dialog_fragment.xml
@@ -22,40 +22,40 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
+	a:orientation="vertical">
 
 	<TextView
-			a:id="@+id/cpp_dialog_message_textview"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:maxLines="10"
-			a:scrollbars="vertical"/>
+		a:id="@+id/cpp_dialog_message_textview"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:maxLines="10"
+		a:scrollbars="vertical" />
 
 	<LinearLayout
-			a:layout_width="match_parent"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="horizontal">
+
+		<Button
+			a:id="@+id/cpp_copy_button"
+			a:layout_width="0dp"
 			a:layout_height="wrap_content"
-			a:orientation="horizontal">
+			a:layout_weight="1"
+			a:text="@string/c_copy"
+			a:visibility="gone" />
 
 		<Button
-				a:id="@+id/cpp_copy_button"
-				a:text="@string/c_copy"
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:visibility="gone"/>
-
-		<Button
-				a:id="@+id/cpp_ok_button"
-				a:text="@string/ok"
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"/>
+			a:id="@+id/cpp_ok_button"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:text="@string/ok" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
index 3b81a023..d8075a99 100644
--- a/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_fixable_messages_dialog.xml
@@ -22,32 +22,32 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  style="@style/CppDialog">
+<LinearLayout style="@style/CppDialog"
+	xmlns:a="http://schemas.android.com/apk/res/android">
 
 	<LinearLayout
-			a:id="@+id/cpp_fixable_messages_container"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="vertical"/>
+		a:id="@+id/cpp_fixable_messages_container"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="vertical" />
 
 	<CheckBox
-			a:id="@+id/cpp_do_not_show_fixable_messages_checkbox"
-			a:text="@string/do_not_show_messages_in_session"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_do_not_show_fixable_messages_checkbox"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/do_not_show_messages_in_session" />
 
 	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal"
-			a:gravity="center">
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:gravity="center"
+		a:orientation="horizontal">
 
 		<Button
-				a:id="@+id/close_button"
-				a:layout_width="wrap_content"
-				a:layout_height="wrap_content"
-				a:text="@string/close"/>
+			a:id="@+id/close_button"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:text="@string/close" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml b/android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
index cc9b60e6..8302df35 100644
--- a/android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
+++ b/android-app/src/main/res/layout/cpp_fixable_messages_dialog_message.xml
@@ -23,24 +23,24 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="wrap_content"
-			  a:orientation="horizontal"
-			  a:padding="6dp">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:orientation="horizontal"
+	a:padding="6dp">
 
 	<TextView
-			a:id="@+id/cpp_fixable_messages_text_view"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="5"
-			a:layout_gravity="fill"
-			a:text="@+id/cpp_fixable_messages_text_view"/>
+		a:id="@+id/cpp_fixable_messages_text_view"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_gravity="fill"
+		a:layout_weight="5"
+		a:text="@+id/cpp_fixable_messages_text_view" />
 
 	<Button
-			a:id="@+id/cpp_fix_button"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="2"
-			a:text="@string/fix"/>
+		a:id="@+id/cpp_fix_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="2"
+		a:text="@string/fix" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_fragment.xml b/android-app/src/main/res/layout/cpp_plot_fragment.xml
index e18f368f..9e5674b3 100644
--- a/android-app/src/main/res/layout/cpp_plot_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_fragment.xml
@@ -22,19 +22,19 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
 	<TextView
-			a:id="@+id/fragment_title"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			style="@style/CppFragmentTitle"/>
+		a:id="@+id/fragment_title"
+		style="@style/CppFragmentTitle"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content" />
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_function_list_item.xml b/android-app/src/main/res/layout/cpp_plot_function_list_item.xml
index b4a7f567..8a382d51 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_list_item.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_list_item.xml
@@ -23,36 +23,36 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="wrap_content"
-			  a:orientation="horizontal">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:orientation="horizontal">
 
 	<TextView
-			a:id="@+id/cpp_plot_function_expression_textview"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="3"/>
+		a:id="@+id/cpp_plot_function_expression_textview"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="3" />
 
 	<CheckBox
-			a:id="@+id/cpp_plot_function_pinned_checkbox"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"/>
+		a:id="@+id/cpp_plot_function_pinned_checkbox"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1" />
 
 	<CheckBox
-			a:id="@+id/cpp_plot_function_visible_checkbox"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"/>
+		a:id="@+id/cpp_plot_function_visible_checkbox"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1" />
 
 	<ImageButton
-			a:id="@+id/cpp_plot_function_settings_button"
-			a:layout_width="0dp"
-			a:layout_height="wrap_content"
-			a:layout_weight="1"
-			a:paddingTop="0dp"
-			a:paddingBottom="0dp"
-			a:scaleType="centerInside"
-			a:src="@drawable/kb_settings"/>
+		a:id="@+id/cpp_plot_function_settings_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:paddingBottom="0dp"
+		a:paddingTop="0dp"
+		a:scaleType="centerInside"
+		a:src="@drawable/kb_settings" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
index 82a3e35b..f0c75955 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_dialog.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/dialog_layout"
-			  style="@style/CppDialog">
+<LinearLayout a:id="@+id/dialog_layout"
+	style="@style/CppDialog"
+	xmlns:a="http://schemas.android.com/apk/res/android">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
index 15371764..7cb7940b 100644
--- a/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_function_settings_fragment.xml
@@ -22,63 +22,63 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="wrap_content"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="wrap_content"
+	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
+	a:orientation="vertical">
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_color_type"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_plot_function_line_color_type" />
 
 	<Spinner
-			a:id="@+id/cpp_plot_function_line_color_type_spinner"
-			a:entries="@array/cpp_plot_line_color_type_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_plot_function_line_color_type_spinner"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_color_type_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_color"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_plot_function_line_color" />
 
 	<Spinner
-			a:id="@+id/cpp_plot_function_line_color_spinner"
-			a:entries="@array/cpp_plot_line_color_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_plot_function_line_color_spinner"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_color_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_style"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_plot_function_line_style" />
 
 	<Spinner
-			a:id="@+id/cpp_plot_function_line_style_spinner"
-			a:entries="@array/cpp_plot_line_style_names"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_plot_function_line_style_spinner"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:entries="@array/cpp_plot_line_style_names" />
 
 	<TextView
-			a:text="@string/cpp_plot_function_line_width"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_plot_function_line_width" />
 
 	<SeekBar
-			a:id="@+id/cpp_plot_functions_line_width_seekbar"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_plot_functions_line_width_seekbar"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content" />
 
 	<Button
-			a:id="@+id/cpp_apply_button"
-			a:text="@string/cpp_apply"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_apply_button"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_apply" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
index c95b4381..4e66a77d 100644
--- a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
@@ -22,44 +22,44 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
 	<LinearLayout
-			a:layout_width="match_parent"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="horizontal">
+
+		<TextView
+			a:layout_width="0dp"
 			a:layout_height="wrap_content"
-			a:orientation="horizontal">
+			a:layout_weight="3"
+			a:text="@string/cpp_function" />
 
 		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="3"
-				a:text="@string/cpp_function"/>
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:text="@string/cpp_pinned" />
 
 		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:text="@string/cpp_pinned"/>
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:text="@string/cpp_visible" />
 
 		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:text="@string/cpp_visible"/>
-
-		<TextView
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"/>
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1" />
 
 	</LinearLayout>
 
-	<ListView style="@style/CppListView"/>
+	<ListView style="@style/CppListView" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
index a9dabd0b..0b62eb8e 100644
--- a/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_range_fragment.xml
@@ -22,110 +22,110 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
+	a:orientation="vertical">
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
 	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal"
-			a:baselineAligned="false">
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:baselineAligned="false"
+		a:orientation="horizontal">
 
 		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:orientation="vertical">
 
 			<TextView
-					a:text="@string/cpp_plot_range_x_min"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:text="@string/cpp_plot_range_x_min" />
 
 			<EditText
-					a:id="@+id/cpp_plot_range_x_min_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:id="@+id/cpp_plot_range_x_min_editext"
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:inputType="numberDecimal|numberSigned" />
 		</LinearLayout>
 
 		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:orientation="vertical">
 
 			<TextView
-					a:text="@string/cpp_plot_range_x_max"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:text="@string/cpp_plot_range_x_max" />
 
 			<EditText
-					a:id="@+id/cpp_plot_range_x_max_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:id="@+id/cpp_plot_range_x_max_editext"
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:inputType="numberDecimal|numberSigned" />
 		</LinearLayout>
 
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:orientation="horizontal"
-			a:baselineAligned="false">
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:baselineAligned="false"
+		a:orientation="horizontal">
 
 		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:orientation="vertical">
 
 			<TextView
-					a:text="@string/cpp_plot_range_y_min"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:text="@string/cpp_plot_range_y_min" />
 
 			<EditText
-					a:id="@+id/cpp_plot_range_y_min_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:id="@+id/cpp_plot_range_y_min_editext"
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:inputType="numberDecimal|numberSigned" />
 		</LinearLayout>
 
 		<LinearLayout
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"
-				a:layout_weight="1"
-				a:orientation="vertical">
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="1"
+			a:orientation="vertical">
 
 			<TextView
-					a:text="@string/cpp_plot_range_y_max"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:text="@string/cpp_plot_range_y_max" />
 
 			<EditText
-					a:id="@+id/cpp_plot_range_y_max_editext"
-					a:inputType="numberDecimal|numberSigned"
-					a:layout_width="match_parent"
-					a:layout_height="wrap_content"/>
+				a:id="@+id/cpp_plot_range_y_max_editext"
+				a:layout_width="match_parent"
+				a:layout_height="wrap_content"
+				a:inputType="numberDecimal|numberSigned" />
 		</LinearLayout>
 
 
 	</LinearLayout>
 
 	<Button
-			a:id="@+id/cpp_apply_button"
-			a:text="@string/cpp_apply"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_apply_button"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_apply" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
index 8a1ed044..51f8446b 100644
--- a/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_purchase_dialog_fragment.xml
@@ -22,26 +22,26 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_gravity="center_horizontal"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:layout_gravity="center_horizontal"
+	a:orientation="vertical">
 
 	<TextView
-			a:id="@+id/cpp_purchase_text"
-			a:text="@string/cpp_purchase_text"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"
-			a:maxLines="10"
-			a:scrollbars="vertical"/>
+		a:id="@+id/cpp_purchase_text"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:maxLines="10"
+		a:scrollbars="vertical"
+		a:text="@string/cpp_purchase_text" />
 
 	<Button
-			a:id="@+id/cpp_continue_button"
-			a:text="@string/cpp_continue"
-			a:layout_width="match_parent"
-			a:layout_height="wrap_content"/>
+		a:id="@+id/cpp_continue_button"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_continue" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_release_note_step.xml b/android-app/src/main/res/layout/cpp_release_note_step.xml
index 504b0ee6..7dab0a6f 100644
--- a/android-app/src/main/res/layout/cpp_release_note_step.xml
+++ b/android-app/src/main/res/layout/cpp_release_note_step.xml
@@ -25,21 +25,21 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	a:gravity="center">
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
-		style="@style/WizardLabel"
 		a:id="@+id/release_note_title"
-		a:layout_height="wrap_content"
+		style="@style/WizardLabel"
 		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
 		a:textAppearance="@android:style/TextAppearance.Large" />
 
 	<TextView
-		style="@style/WizardLabel.Last"
 		a:id="@+id/release_note_message"
-		a:layout_height="wrap_content"
+		style="@style/WizardLabel.Last"
 		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
 		a:textAppearance="@android:style/TextAppearance.Medium" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_simple_button_0.xml b/android-app/src/main/res/layout/cpp_simple_button_0.xml
index d035e05b..b7b1a128 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_0.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_0.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_0"
-		a:text="0"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_0"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="0" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_1.xml b/android-app/src/main/res/layout/cpp_simple_button_1.xml
index f67ba33c..ad4f9dbb 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_1.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_1.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_1"
-		a:text="1"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_1"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="1" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_2.xml b/android-app/src/main/res/layout/cpp_simple_button_2.xml
index 574c3219..bca037c1 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_2.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_2.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_2"
-		a:text="2"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_2"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="2" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_3.xml b/android-app/src/main/res/layout/cpp_simple_button_3.xml
index 478d8499..f7b888e8 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_3.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_3.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_3"
-		a:text="3"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_3"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="3" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_4.xml b/android-app/src/main/res/layout/cpp_simple_button_4.xml
index 01ea63a7..7ce22b95 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_4.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_4.xml
@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_4"
-		a:text="4"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_4"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="4" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_5.xml b/android-app/src/main/res/layout/cpp_simple_button_5.xml
index d3b13012..1918c946 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_5.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_5.xml
@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_5"
-		a:text="5"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_5"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="5" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_6.xml b/android-app/src/main/res/layout/cpp_simple_button_6.xml
index b1855117..24d3ce29 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_6.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_6.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_6"
-		a:text="6"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_6"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="6" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_7.xml b/android-app/src/main/res/layout/cpp_simple_button_7.xml
index aea343b8..c8dc8db6 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_7.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_7.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_7"
-		a:text="7"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_7"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="7" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_8.xml b/android-app/src/main/res/layout/cpp_simple_button_8.xml
index 635bbe36..ae036542 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_8.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_8.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_8"
-		a:text="8"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_8"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="8" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_9.xml b/android-app/src/main/res/layout/cpp_simple_button_9.xml
index e0ae8c34..52f5a1fc 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_9.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_9.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_9"
-		a:text="9"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_9"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="9" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_app.xml b/android-app/src/main/res/layout/cpp_simple_button_app.xml
index 66f58039..7ba488bd 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_app.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_app.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_app"
-			 a:src="@drawable/kb_logo"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="App"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_app"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="App"
+	a:src="@drawable/kb_logo" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_clear.xml b/android-app/src/main/res/layout/cpp_simple_button_clear.xml
index 92b1a42c..a2503d07 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_clear.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_clear.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_clear"
-		a:text="@string/c_clear"
-		a:textStyle="bold"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_clear"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="@string/c_clear"
+	a:textStyle="bold" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_copy.xml b/android-app/src/main/res/layout/cpp_simple_button_copy.xml
index f8b02a21..3314b44d 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_copy.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_copy.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_copy"
-			 a:src="@drawable/kb_copy"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="Copy"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_copy"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Copy"
+	a:src="@drawable/kb_copy" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_division.xml b/android-app/src/main/res/layout/cpp_simple_button_division.xml
index bb48911f..94eea248 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_division.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_division.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_division"
-		a:text="/"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_division"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="/" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_dot.xml b/android-app/src/main/res/layout/cpp_simple_button_dot.xml
index 09abf5e5..2fb43629 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_dot.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_dot.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_period"
-		a:text="."
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_period"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="." />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_equals.xml b/android-app/src/main/res/layout/cpp_simple_button_equals.xml
index fd84179c..b797b42f 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_equals.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_equals.xml
@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_equals"
-		a:text="="
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_equals"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="=" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_erase.xml b/android-app/src/main/res/layout/cpp_simple_button_erase.xml
index 9cccce0b..2c299fe2 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_erase.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_erase.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_erase"
-			 a:src="@drawable/kb_erase"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="Erase"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_erase"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Erase"
+	a:src="@drawable/kb_erase" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_functions.xml b/android-app/src/main/res/layout/cpp_simple_button_functions.xml
index bc9ed462..313a1c5f 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_functions.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_functions.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_functions"
-		a:text="ƒ(x)"
-		a:textStyle="italic"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_functions"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="ƒ(x)"
+	a:textStyle="italic" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_history.xml b/android-app/src/main/res/layout/cpp_simple_button_history.xml
index ab407d13..e73b16c4 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_history.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_history.xml
@@ -21,8 +21,8 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_history"
-		a:text="@string/c_history_button"
-		style="@style/cpp_simple_metro_control_button_style"
-		a:textStyle="bold"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_history"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="@string/c_history_button"
+	a:textStyle="bold" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_left.xml b/android-app/src/main/res/layout/cpp_simple_button_left.xml
index 322a9d1d..fee35d31 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_left.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_left.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_left"
-		a:text="◁"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_left"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="◁" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_like.xml b/android-app/src/main/res/layout/cpp_simple_button_like.xml
index 7c6ea811..af2cb020 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_like.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_like.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_like"
-			 a:src="@drawable/kb_share"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="Like"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_like"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Like"
+	a:src="@drawable/kb_share" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_multiplication.xml b/android-app/src/main/res/layout/cpp_simple_button_multiplication.xml
index 57fb7e39..f4a66cbe 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_multiplication.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_multiplication.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_multiplication"
-		a:text="×"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_multiplication"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="×" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_operators.xml b/android-app/src/main/res/layout/cpp_simple_button_operators.xml
index ca9af29a..3d2d890f 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_operators.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_operators.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_operators"
-		a:text="∂,…"
-		a:textStyle="italic"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_operators"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="∂,…"
+	a:textStyle="italic" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_paste.xml b/android-app/src/main/res/layout/cpp_simple_button_paste.xml
index 84ce21fa..38e7105b 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_paste.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_paste.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_paste"
-			 a:src="@drawable/kb_paste"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="Paste"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_paste"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Paste"
+	a:src="@drawable/kb_paste" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_percent.xml b/android-app/src/main/res/layout/cpp_simple_button_percent.xml
index 0c7e99cd..872ca84e 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_percent.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_percent.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_percent"
-		a:text="%"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_percent"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="%" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_plus.xml b/android-app/src/main/res/layout/cpp_simple_button_plus.xml
index e66a20ce..615fb575 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_plus.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_plus.xml
@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_plus"
-		a:text="+"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_plus"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="+" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_power.xml b/android-app/src/main/res/layout/cpp_simple_button_power.xml
index 257a2dee..69465bbd 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_power.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_power.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_power"
-		a:text="^"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_power"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="^" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_right.xml b/android-app/src/main/res/layout/cpp_simple_button_right.xml
index 24bc3b56..975c98de 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_right.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_right.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_right"
-		a:text="▷"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_right"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="▷" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml b/android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml
index 395369c0..dd8b32cd 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_round_brackets.xml
@@ -22,7 +22,7 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_round_brackets"
-		a:text="(  )"
-		style="@style/cpp_simple_metro_digit_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_round_brackets"
+	style="@style/cpp_simple_metro_digit_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="(  )" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_settings.xml b/android-app/src/main/res/layout/cpp_simple_button_settings.xml
index 748647fc..c3f7a2ce 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_settings.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_settings.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
-			 a:id="@id/cpp_button_settings"
-			 a:src="@drawable/kb_settings"
-			 style="@style/cpp_simple_metro_control_image_button_style"
-			 a:contentDescription="Settings"/>
\ No newline at end of file
+<ImageButton a:id="@id/cpp_button_settings"
+	style="@style/cpp_simple_metro_control_image_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:contentDescription="Settings"
+	a:src="@drawable/kb_settings" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_subtraction.xml b/android-app/src/main/res/layout/cpp_simple_button_subtraction.xml
index 7f7fa9b5..5ec8cd5c 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_subtraction.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_subtraction.xml
@@ -21,7 +21,7 @@
   ~ Email: se.solovyev@gmail.com
   ~ Site:  http://se.solovyev.org
   -->
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_subtraction"
-		a:text="-"
-		style="@style/cpp_simple_metro_blue_operation_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_subtraction"
+	style="@style/cpp_simple_metro_blue_operation_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="-" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_button_vars.xml b/android-app/src/main/res/layout/cpp_simple_button_vars.xml
index 314db7fe..e33e3e1f 100644
--- a/android-app/src/main/res/layout/cpp_simple_button_vars.xml
+++ b/android-app/src/main/res/layout/cpp_simple_button_vars.xml
@@ -22,8 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<Button xmlns:a="http://schemas.android.com/apk/res/android"
-		a:id="@id/cpp_button_vars"
-		a:text="π,…"
-		a:textStyle="italic"
-		style="@style/cpp_simple_metro_control_button_style"/>
\ No newline at end of file
+<Button a:id="@id/cpp_button_vars"
+	style="@style/cpp_simple_metro_control_button_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:text="π,…"
+	a:textStyle="italic" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_keyboard.xml b/android-app/src/main/res/layout/cpp_simple_keyboard.xml
index a964a801..e4295a90 100644
--- a/android-app/src/main/res/layout/cpp_simple_keyboard.xml
+++ b/android-app/src/main/res/layout/cpp_simple_keyboard.xml
@@ -23,103 +23,103 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_7"/>
+		<include layout="@layout/cpp_simple_button_7" />
 
-		<include layout="@layout/cpp_simple_button_8"/>
+		<include layout="@layout/cpp_simple_button_8" />
 
-		<include layout="@layout/cpp_simple_button_9"/>
+		<include layout="@layout/cpp_simple_button_9" />
 
-		<include layout="@layout/cpp_simple_button_multiplication"/>
+		<include layout="@layout/cpp_simple_button_multiplication" />
 
-		<include layout="@layout/cpp_simple_button_percent"/>
+		<include layout="@layout/cpp_simple_button_percent" />
 
-		<include layout="@layout/cpp_simple_button_clear"/>
+		<include layout="@layout/cpp_simple_button_clear" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_4"/>
+		<include layout="@layout/cpp_simple_button_4" />
 
-		<include layout="@layout/cpp_simple_button_5"/>
+		<include layout="@layout/cpp_simple_button_5" />
 
-		<include layout="@layout/cpp_simple_button_6"/>
+		<include layout="@layout/cpp_simple_button_6" />
 
-		<include layout="@layout/cpp_simple_button_division"/>
+		<include layout="@layout/cpp_simple_button_division" />
 
-		<include layout="@layout/cpp_simple_button_power"/>
+		<include layout="@layout/cpp_simple_button_power" />
 
-		<include layout="@layout/cpp_simple_button_erase"/>
+		<include layout="@layout/cpp_simple_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_1"/>
+		<include layout="@layout/cpp_simple_button_1" />
 
-		<include layout="@layout/cpp_simple_button_2"/>
+		<include layout="@layout/cpp_simple_button_2" />
 
-		<include layout="@layout/cpp_simple_button_3"/>
+		<include layout="@layout/cpp_simple_button_3" />
 
-		<include layout="@layout/cpp_simple_button_plus"/>
+		<include layout="@layout/cpp_simple_button_plus" />
 
-		<include layout="@layout/cpp_simple_button_settings"/>
+		<include layout="@layout/cpp_simple_button_settings" />
 
-		<include layout="@layout/cpp_simple_button_copy"/>
+		<include layout="@layout/cpp_simple_button_copy" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_round_brackets"/>
+		<include layout="@layout/cpp_simple_button_round_brackets" />
 
-		<include layout="@layout/cpp_simple_button_0"/>
+		<include layout="@layout/cpp_simple_button_0" />
 
-		<include layout="@layout/cpp_simple_button_dot"/>
+		<include layout="@layout/cpp_simple_button_dot" />
 
-		<include layout="@layout/cpp_simple_button_subtraction"/>
+		<include layout="@layout/cpp_simple_button_subtraction" />
 
-		<include layout="@layout/cpp_simple_button_app"/>
+		<include layout="@layout/cpp_simple_button_app" />
 
-		<include layout="@layout/cpp_simple_button_paste"/>
+		<include layout="@layout/cpp_simple_button_paste" />
 
 	</LinearLayout>
 
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_left"/>
+		<include layout="@layout/cpp_simple_button_left" />
 
-		<include layout="@layout/cpp_simple_button_right"/>
+		<include layout="@layout/cpp_simple_button_right" />
 
-		<include layout="@layout/cpp_simple_button_vars"/>
+		<include layout="@layout/cpp_simple_button_vars" />
 
-		<include layout="@layout/cpp_simple_button_functions"/>
+		<include layout="@layout/cpp_simple_button_functions" />
 
-		<include layout="@layout/cpp_simple_button_operators"/>
+		<include layout="@layout/cpp_simple_button_operators" />
 
-		<include layout="@layout/cpp_simple_button_history"/>
+		<include layout="@layout/cpp_simple_button_history" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml b/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
index 297f86f8..7a8abd54 100644
--- a/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
+++ b/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen.xml
@@ -23,83 +23,83 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_7"/>
+		<include layout="@layout/cpp_simple_button_7" />
 
-		<include layout="@layout/cpp_simple_button_8"/>
+		<include layout="@layout/cpp_simple_button_8" />
 
-		<include layout="@layout/cpp_simple_button_9"/>
+		<include layout="@layout/cpp_simple_button_9" />
 
-		<include layout="@layout/cpp_simple_button_multiplication"/>
+		<include layout="@layout/cpp_simple_button_multiplication" />
 
-		<include layout="@layout/cpp_simple_button_percent"/>
+		<include layout="@layout/cpp_simple_button_percent" />
 
-		<include layout="@layout/cpp_simple_button_clear"/>
+		<include layout="@layout/cpp_simple_button_clear" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_4"/>
+		<include layout="@layout/cpp_simple_button_4" />
 
-		<include layout="@layout/cpp_simple_button_5"/>
+		<include layout="@layout/cpp_simple_button_5" />
 
-		<include layout="@layout/cpp_simple_button_6"/>
+		<include layout="@layout/cpp_simple_button_6" />
 
-		<include layout="@layout/cpp_simple_button_division"/>
+		<include layout="@layout/cpp_simple_button_division" />
 
-		<include layout="@layout/cpp_simple_button_power"/>
+		<include layout="@layout/cpp_simple_button_power" />
 
-		<include layout="@layout/cpp_simple_button_erase"/>
+		<include layout="@layout/cpp_simple_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_1"/>
+		<include layout="@layout/cpp_simple_button_1" />
 
-		<include layout="@layout/cpp_simple_button_2"/>
+		<include layout="@layout/cpp_simple_button_2" />
 
-		<include layout="@layout/cpp_simple_button_3"/>
+		<include layout="@layout/cpp_simple_button_3" />
 
-		<include layout="@layout/cpp_simple_button_plus"/>
+		<include layout="@layout/cpp_simple_button_plus" />
 
-		<include layout="@layout/cpp_simple_button_left"/>
+		<include layout="@layout/cpp_simple_button_left" />
 
-		<include layout="@layout/cpp_simple_button_copy"/>
+		<include layout="@layout/cpp_simple_button_copy" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_round_brackets"/>
+		<include layout="@layout/cpp_simple_button_round_brackets" />
 
-		<include layout="@layout/cpp_simple_button_0"/>
+		<include layout="@layout/cpp_simple_button_0" />
 
-		<include layout="@layout/cpp_simple_button_dot"/>
+		<include layout="@layout/cpp_simple_button_dot" />
 
-		<include layout="@layout/cpp_simple_button_subtraction"/>
+		<include layout="@layout/cpp_simple_button_subtraction" />
 
-		<include layout="@layout/cpp_simple_button_right"/>
+		<include layout="@layout/cpp_simple_button_right" />
 
-		<include layout="@layout/cpp_simple_button_paste"/>
+		<include layout="@layout/cpp_simple_button_paste" />
 
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml b/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
index ec2ae6e6..8205a8be 100644
--- a/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
+++ b/android-app/src/main/res/layout/cpp_simple_keyboard_lockscreen_collapsed.xml
@@ -23,64 +23,64 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_7"/>
+		<include layout="@layout/cpp_simple_button_7" />
 
-		<include layout="@layout/cpp_simple_button_8"/>
+		<include layout="@layout/cpp_simple_button_8" />
 
-		<include layout="@layout/cpp_simple_button_9"/>
+		<include layout="@layout/cpp_simple_button_9" />
 
-		<include layout="@layout/cpp_simple_button_multiplication"/>
+		<include layout="@layout/cpp_simple_button_multiplication" />
 
-		<include layout="@layout/cpp_simple_button_plus"/>
+		<include layout="@layout/cpp_simple_button_plus" />
 
-		<include layout="@layout/cpp_simple_button_clear"/>
+		<include layout="@layout/cpp_simple_button_clear" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_4"/>
+		<include layout="@layout/cpp_simple_button_4" />
 
-		<include layout="@layout/cpp_simple_button_5"/>
+		<include layout="@layout/cpp_simple_button_5" />
 
-		<include layout="@layout/cpp_simple_button_6"/>
+		<include layout="@layout/cpp_simple_button_6" />
 
-		<include layout="@layout/cpp_simple_button_division"/>
+		<include layout="@layout/cpp_simple_button_division" />
 
-		<include layout="@layout/cpp_simple_button_subtraction"/>
+		<include layout="@layout/cpp_simple_button_subtraction" />
 
-		<include layout="@layout/cpp_simple_button_erase"/>
+		<include layout="@layout/cpp_simple_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_1"/>
+		<include layout="@layout/cpp_simple_button_1" />
 
-		<include layout="@layout/cpp_simple_button_2"/>
+		<include layout="@layout/cpp_simple_button_2" />
 
-		<include layout="@layout/cpp_simple_button_3"/>
+		<include layout="@layout/cpp_simple_button_3" />
 
-		<include layout="@layout/cpp_simple_button_0"/>
+		<include layout="@layout/cpp_simple_button_0" />
 
-		<include layout="@layout/cpp_simple_button_percent"/>
+		<include layout="@layout/cpp_simple_button_percent" />
 
-		<include layout="@layout/cpp_simple_button_dot"/>
+		<include layout="@layout/cpp_simple_button_dot" />
 
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_unit_converter.xml b/android-app/src/main/res/layout/cpp_unit_converter.xml
index 5733b43d..8d00a958 100644
--- a/android-app/src/main/res/layout/cpp_unit_converter.xml
+++ b/android-app/src/main/res/layout/cpp_unit_converter.xml
@@ -23,87 +23,87 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent"
-			  a:paddingLeft="10dp"
-			  a:paddingRight="10dp"
-			  a:orientation="vertical">
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent"
+	a:orientation="vertical"
+	a:paddingLeft="10dp"
+	a:paddingRight="10dp">
 
 	<LinearLayout
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
-			a:paddingBottom="10dp"
-			a:orientation="horizontal">
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:orientation="horizontal"
+		a:paddingBottom="10dp">
 
 		<Spinner
-				a:id="@+id/unit_types_from"
-				a:layout_width="wrap_content"
-				a:layout_height="fill_parent"/>
+			a:id="@+id/unit_types_from"
+			a:layout_width="wrap_content"
+			a:layout_height="fill_parent" />
 
 
 		<EditText
-				a:id="@+id/units_from"
-				a:inputType="text"
-				a:singleLine="true"
-				a:layout_width="fill_parent"
-				a:layout_height="fill_parent"/>
+			a:id="@+id/units_from"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
+			a:inputType="text"
+			a:singleLine="true" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_width="fill_parent"
-			a:paddingBottom="10dp"
-			a:layout_height="fill_parent"
-			a:orientation="horizontal">
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:orientation="horizontal"
+		a:paddingBottom="10dp">
 
 		<Spinner
-				a:id="@+id/unit_types_to"
-				a:layout_width="wrap_content"
-				a:layout_height="fill_parent"/>
+			a:id="@+id/unit_types_to"
+			a:layout_width="wrap_content"
+			a:layout_height="fill_parent" />
 
 		<EditText
-				a:id="@+id/units_to"
-				a:editable="false"
-				a:inputType="none"
-				a:singleLine="true"
-				a:layout_width="fill_parent"
-				a:layout_height="fill_parent"/>
+			a:id="@+id/units_to"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
+			a:editable="false"
+			a:inputType="none"
+			a:singleLine="true" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_width="fill_parent"
-			a:paddingBottom="10dp"
-			a:layout_height="fill_parent"
-			a:gravity="center"
-			a:orientation="horizontal">
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:gravity="center"
+		a:orientation="horizontal"
+		a:paddingBottom="10dp">
 
 		<Button
-				a:id="@+id/unit_converter_ok_button"
-				a:text="@android:string/ok"
-				a:paddingLeft="15dp"
-				a:paddingRight="15dp"
-				a:singleLine="true"
-				a:layout_width="wrap_content"
-				a:layout_height="wrap_content"/>
+			a:id="@+id/unit_converter_ok_button"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:paddingLeft="15dp"
+			a:paddingRight="15dp"
+			a:singleLine="true"
+			a:text="@android:string/ok" />
 
 		<Button
-				a:id="@+id/unit_converter_copy_button"
-				a:text="@android:string/copy"
-				a:paddingLeft="15dp"
-				a:paddingRight="15dp"
-				a:singleLine="true"
-				a:layout_width="wrap_content"
-				a:layout_height="wrap_content"/>
+			a:id="@+id/unit_converter_copy_button"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:paddingLeft="15dp"
+			a:paddingRight="15dp"
+			a:singleLine="true"
+			a:text="@android:string/copy" />
 
 		<Button
-				a:id="@+id/unit_converter_custom_button"
-				a:paddingLeft="15dp"
-				a:paddingRight="15dp"
-				a:ellipsize="end"
-				a:singleLine="true"
-				a:layout_width="wrap_content"
-				a:layout_height="wrap_content"/>
+			a:id="@+id/unit_converter_custom_button"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:ellipsize="end"
+			a:paddingLeft="15dp"
+			a:paddingRight="15dp"
+			a:singleLine="true" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_wiki_page.xml b/android-app/src/main/res/layout/cpp_wiki_page.xml
index 541bb53f..20a0d84b 100644
--- a/android-app/src/main/res/layout/cpp_wiki_page.xml
+++ b/android-app/src/main/res/layout/cpp_wiki_page.xml
@@ -23,12 +23,13 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
-	<WebView a:id="@+id/cpp_wiki_webview"
-			 a:layout_width="match_parent"
-			 a:layout_height="match_parent"/>
+	<WebView
+		a:id="@+id/cpp_wiki_webview"
+		a:layout_width="match_parent"
+		a:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/cpp_wizard.xml b/android-app/src/main/res/layout/cpp_wizard.xml
index 50f37d0f..f5cf1469 100644
--- a/android-app/src/main/res/layout/cpp_wizard.xml
+++ b/android-app/src/main/res/layout/cpp_wizard.xml
@@ -22,43 +22,43 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:id="@+id/wizard_layout"
+<LinearLayout a:id="@+id/wizard_layout"
 	style="@style/CppDialog"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical">
 
 	<FrameLayout
-		a:orientation="vertical"
 		a:id="@id/acl_wizard_content"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
 		a:layout_weight="1"
-		a:padding="6dp"
-		a:gravity="center" />
+		a:gravity="center"
+		a:orientation="vertical"
+		a:padding="6dp" />
 
 	<LinearLayout
-		a:orientation="horizontal"
 		a:layout_width="match_parent"
-		a:layout_height="wrap_content">
+		a:layout_height="wrap_content"
+		a:orientation="horizontal">
 
 		<Button
 			a:id="@id/acl_wizard_prev_button"
-			a:layout_height="wrap_content"
 			a:layout_width="0dp"
+			a:layout_height="wrap_content"
 			a:layout_weight="1"
-			a:singleLine="true"
 			a:lines="1"
 			a:maxLines="1"
+			a:singleLine="true"
 			a:text="@string/cpp_wizard_back" />
 
 		<Button
 			a:id="@id/acl_wizard_next_button"
-			a:layout_height="wrap_content"
 			a:layout_width="0dp"
+			a:layout_height="wrap_content"
 			a:layout_weight="1"
-			a:singleLine="true"
 			a:lines="1"
 			a:maxLines="1"
+			a:singleLine="true"
 			a:text="@string/cpp_wizard_next" />
 
 	</LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
index ebe982fb..d1b28b8c 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_layout.xml
@@ -25,27 +25,26 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	a:gravity="center">
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:textAppearance="@android:style/TextAppearance.Large"
-		style="@style/WizardLabel"
-		a:text="@string/cpp_wizard_layout_title" />
+		a:text="@string/cpp_wizard_layout_title"
+		a:textAppearance="@android:style/TextAppearance.Large" />
 
 	<Spinner
 		a:id="@+id/wizard_layout_spinner"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
-		style="@style/WizardLabel" />
+		a:layout_height="wrap_content" />
 
 	<ImageView
 		a:id="@+id/wizard_layout_image"
-		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
 		style="@style/WizardLabel.Last"
-		/>
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
index a855d5e1..7a8b5451 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_mode.xml
@@ -26,51 +26,51 @@
 	xmlns:c="http://schemas.android.com/apk/res-auto"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	a:gravity="center">
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:textAppearance="@android:style/TextAppearance.Large"
-		style="@style/WizardLabel"
 		a:layout_marginBottom="20dp"
-		a:text="@string/cpp_wizard_mode_title" />
+		a:text="@string/cpp_wizard_mode_title"
+		a:textAppearance="@android:style/TextAppearance.Large" />
 
 	<Spinner
 		a:id="@+id/wizard_mode_spinner"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:layout_marginBottom="20dp"
-		style="@style/WizardLabel" />
+		a:layout_marginBottom="20dp" />
 
 	<LinearLayout
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		a:orientation="vertical"
-		a:gravity="center_horizontal|top">
+		a:gravity="center_horizontal|top"
+		a:orientation="vertical">
 
 		<FrameLayout
 			a:layout_width="wrap_content"
 			a:layout_height="wrap_content"
-			a:padding="3dp"
 			a:layout_marginBottom="10dp"
-			a:background="?attr/cpp_main_bg">
+			a:background="?attr/cpp_main_bg"
+			a:padding="3dp">
 
 			<org.solovyev.android.calculator.drag.DirectionDragButton
 				a:id="@+id/wizard_mode_button"
-				a:text="7"
-				c:directionTextScale="0.5"
+				style="?attr/cpp_button_style_operation"
 				a:layout_width="100dp"
 				a:layout_height="100dp"
-				style="?attr/cpp_button_style_operation" />
+				a:text="7"
+				c:directionTextScale="0.5" />
 		</FrameLayout>
 
 		<TextView
 			a:id="@+id/wizard_mode_description"
+			style="@style/WizardLabel.Last"
 			a:layout_width="wrap_content"
-			a:layout_height="wrap_content"
-			style="@style/WizardLabel.Last" />
+			a:layout_height="wrap_content" />
 	</LinearLayout>
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
index 6febe723..0881bd8d 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme.xml
@@ -25,29 +25,28 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	a:gravity="center">
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
-		a:layout_width="wrap_content"
 		a:id="@+id/wizard_theme_title"
-		a:layout_height="wrap_content"
-		a:textAppearance="@android:style/TextAppearance.Large"
 		style="@style/WizardLabel"
-		a:text="@string/cpp_wizard_theme_title" />
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_wizard_theme_title"
+		a:textAppearance="@android:style/TextAppearance.Large" />
 
 	<Spinner
 		a:id="@+id/wizard_theme_spinner"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
-		a:layout_height="wrap_content"
-		style="@style/WizardLabel" />
+		a:layout_height="wrap_content" />
 
 	<FrameLayout
 		a:id="@+id/wizard_theme_preview"
+		style="@style/WizardLabel.Last"
 		a:layout_width="wrap_content"
 		a:layout_height="wrap_content"
-		style="@style/WizardLabel.Last"
-		a:orientation="vertical"
-		/>
+		a:orientation="vertical" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
index c21c6b65..2fc66705 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_choose_theme_preview.xml
@@ -25,10 +25,10 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="wrap_content"
 	a:layout_height="wrap_content"
+	a:background="?attr/cpp_main_bg"
 	a:minWidth="200dp"
 	a:orientation="vertical"
-	a:padding="3dp"
-	a:background="?attr/cpp_main_bg">
+	a:padding="3dp">
 
 	<LinearLayout
 		a:layout_width="match_parent"
@@ -38,11 +38,11 @@
 		<include layout="@layout/cpp_app_button_equals_no_bg" />
 
 		<TextView
+			style="@style/CppText.Display"
 			a:layout_width="0dp"
 			a:layout_height="match_parent"
-			style="@style/CppText.Display"
-			a:text="3.1415"
-			a:layout_weight="2"/>
+			a:layout_weight="2"
+			a:text="3.1415" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
index 77e2f0e0..5f5fdd83 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_drag_button.xml
@@ -31,30 +31,30 @@
 
 	<TextView
 		a:id="@+id/wizard_dragbutton_description_textview"
-		a:text="@string/cpp_wizard_dragbutton_description"
-		style="@style/WizardLabel" />
+		style="@style/WizardLabel"
+		a:text="@string/cpp_wizard_dragbutton_description" />
 
 	<TextView
 		a:id="@+id/wizard_dragbutton_action_textview"
-		a:textStyle="bold"
-		a:text="@string/cpp_wizard_dragbutton_action_center"
 		style="@style/WizardLabel"
+		a:maxLines="3"
 		a:minLines="3"
-		a:maxLines="3"/>
+		a:text="@string/cpp_wizard_dragbutton_action_center"
+		a:textStyle="bold" />
 
 	<org.solovyev.android.calculator.drag.DirectionDragButton
-		a:layout_margin="0dp"
-		a:layout_height="wrap_content"
-		a:layout_width="wrap_content"
-		a:minWidth="100dp"
-		a:minHeight="100dp"
-		a:layout_weight="0"
-		a:layout_gravity="center"
 		a:id="@+id/wizard_dragbutton"
+		style="?attr/cpp_button_style_operation"
+		a:layout_width="wrap_content"
+		a:layout_height="wrap_content"
+		a:layout_gravity="center"
+		a:layout_margin="0dp"
+		a:layout_weight="0"
+		a:minHeight="100dp"
+		a:minWidth="100dp"
 		a:text="9"
-		c:textDown="^2"
-		c:textUp="%"
 		c:directionTextScale="0.5;0.5;0.5;0.33"
-		style="?attr/cpp_button_style_operation" />
+		c:textDown="^2"
+		c:textUp="%" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_final.xml b/android-app/src/main/res/layout/cpp_wizard_step_final.xml
index f1b99216..2156f402 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_final.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_final.xml
@@ -25,15 +25,15 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	a:gravity="center">
+	a:gravity="center"
+	a:orientation="vertical">
 
 	<TextView
 		style="@style/WizardLabel.Last"
-		a:drawableTop="@drawable/ic_action_done"
-		a:layout_height="wrap_content"
 		a:layout_width="match_parent"
-		a:textAppearance="@android:style/TextAppearance.Large"
-		a:text="@string/cpp_wizard_final_done" />
+		a:layout_height="wrap_content"
+		a:drawableTop="@drawable/ic_action_done"
+		a:text="@string/cpp_wizard_final_done"
+		a:textAppearance="@android:style/TextAppearance.Large" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml b/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
index 0d19811a..13e8a4ab 100644
--- a/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
+++ b/android-app/src/main/res/layout/cpp_wizard_step_onscreen.xml
@@ -29,17 +29,17 @@
 	a:orientation="vertical">
 
 	<TextView
-		a:drawableTop="@drawable/logo_wizard_window"
-		a:text="@string/cpp_wizard_onscreen_description"
-		a:layout_height="wrap_content"
+		style="@style/WizardLabel"
 		a:layout_width="wrap_content"
-		style="@style/WizardLabel" />
+		a:layout_height="wrap_content"
+		a:drawableTop="@drawable/logo_wizard_window"
+		a:text="@string/cpp_wizard_onscreen_description" />
 
 	<CheckBox
 		a:id="@+id/wizard_onscreen_app_enabled_checkbox"
-		a:layout_height="wrap_content"
+		style="@style/WizardLabel.Last"
 		a:layout_width="wrap_content"
-		a:text="@string/cpp_wizard_onscreen_checkbox"
-		style="@style/WizardLabel.Last" />
+		a:layout_height="wrap_content"
+		a:text="@string/cpp_wizard_onscreen_checkbox" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/display_error_message.xml b/android-app/src/main/res/layout/display_error_message.xml
index 04a61f8b..a82fee98 100644
--- a/android-app/src/main/res/layout/display_error_message.xml
+++ b/android-app/src/main/res/layout/display_error_message.xml
@@ -23,20 +23,22 @@
   -->
 
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent">
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent">
 
-	<LinearLayout a:orientation="vertical"
-				  a:layout_width="match_parent"
-				  a:layout_height="wrap_content"
-				  a:scrollbars="vertical"
-				  a:scrollbarAlwaysDrawVerticalTrack="true">
+	<LinearLayout
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="vertical"
+		a:scrollbarAlwaysDrawVerticalTrack="true"
+		a:scrollbars="vertical">
 
-		<TextView a:id="@+id/error_message_text_view"
-				  a:layout_height="fill_parent"
-				  a:layout_width="wrap_content"
-				  a:padding="6dp"
-				  style="@style/cpp_default_text_size"/>
+		<TextView
+			a:id="@+id/error_message_text_view"
+			style="@style/cpp_default_text_size"
+			a:layout_width="wrap_content"
+			a:layout_height="fill_parent"
+			a:padding="6dp" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/feedback.xml b/android-app/src/main/res/layout/feedback.xml
index a41a3c61..74552ef5 100644
--- a/android-app/src/main/res/layout/feedback.xml
+++ b/android-app/src/main/res/layout/feedback.xml
@@ -23,14 +23,14 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent">
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent">
 
 	<TextView
-			a:id="@+id/feedbackText"
-			style="@style/CppText.About"
-			a:layout_width="fill_parent"
-			a:text="@string/c_feedback_text"
-			a:layout_height="fill_parent"/>
+		a:id="@+id/feedbackText"
+		style="@style/CppText.About"
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:text="@string/c_feedback_text" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/fragment_wizard.xml b/android-app/src/main/res/layout/fragment_wizard.xml
index 91d2b263..82b4449a 100644
--- a/android-app/src/main/res/layout/fragment_wizard.xml
+++ b/android-app/src/main/res/layout/fragment_wizard.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	style="@style/WizardFragment"
+<LinearLayout style="@style/WizardFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical">
 
 	<ScrollView
 		a:id="@+id/wizard_content"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
-		a:layout_weight="1"
-		a:fillViewport="true"
 		a:layout_marginBottom="@dimen/control_margin"
-		a:layout_marginTop="@dimen/control_margin" />
+		a:layout_marginTop="@dimen/control_margin"
+		a:layout_weight="1"
+		a:fillViewport="true" />
 
 	<include layout="@layout/fragment_wizard_buttons" />
 
diff --git a/android-app/src/main/res/layout/fragment_wizard_buttons.xml b/android-app/src/main/res/layout/fragment_wizard_buttons.xml
index 9a3fb53e..02a6372f 100644
--- a/android-app/src/main/res/layout/fragment_wizard_buttons.xml
+++ b/android-app/src/main/res/layout/fragment_wizard_buttons.xml
@@ -3,24 +3,23 @@
 <LinearLayout
 	style="@style/WizardButtons"
 	xmlns:a="http://schemas.android.com/apk/res/android"
-	xmlns:my="http://schemas.android.com/apk/res-auto"
 	a:layout_gravity="center_horizontal|bottom"
 	a:gravity="center">
 
 	<org.solovyev.android.material.MaterialButton
-		style="@style/MaterialButton.Wizard"
 		a:id="@+id/wizard_prev"
-		a:visibility="gone"
+		style="@style/MaterialButton.Wizard"
 		a:layout_width="0dp"
 		a:layout_height="wrap_content"
-		a:layout_weight="1" />
+		a:layout_weight="1"
+		a:visibility="gone" />
 
 	<org.solovyev.android.material.MaterialButton
-		style="@style/MaterialButton.Wizard"
 		a:id="@+id/wizard_next"
-		a:visibility="gone"
+		style="@style/MaterialButton.Wizard"
 		a:layout_width="0dp"
 		a:layout_height="wrap_content"
-		a:layout_weight="1" />
+		a:layout_weight="1"
+		a:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/function_add_param.xml b/android-app/src/main/res/layout/function_add_param.xml
index 876674af..fb4dfa13 100644
--- a/android-app/src/main/res/layout/function_add_param.xml
+++ b/android-app/src/main/res/layout/function_add_param.xml
@@ -23,20 +23,20 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_height="wrap_content"
-			  a:layout_width="match_parent"
-			  a:orientation="horizontal">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:orientation="horizontal">
 
 	<Button
-			a:id="@+id/function_add_param_button"
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:text="+"/>
+		a:id="@+id/function_add_param_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:text="+" />
 
 	<TextView
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="5"/>
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="5" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/function_edit.xml b/android-app/src/main/res/layout/function_edit.xml
index f4cfe3a2..afde170d 100644
--- a/android-app/src/main/res/layout/function_edit.xml
+++ b/android-app/src/main/res/layout/function_edit.xml
@@ -23,93 +23,93 @@
   -->
 
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:minWidth="300dp">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:minWidth="300dp">
 
 	<LinearLayout
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:orientation="vertical">
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="vertical">
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_function_name"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_function_name" />
 
 		<EditText
-				a:id="@+id/function_edit_name"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
+			a:id="@+id/function_edit_name"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="text" />
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_function_parameters"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_function_parameters" />
 
 		<org.solovyev.android.calculator.function.FunctionParamsView
-				a:id="@+id/function_params_layout"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"/>
+			a:id="@+id/function_params_layout"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content" />
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:padding="6dp"
-				a:text="@string/c_function_value"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_function_value" />
 
 		<EditText
-				a:id="@+id/function_edit_value"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
+			a:id="@+id/function_edit_value"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="text" />
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_function_description"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_function_description" />
 
 		<EditText
-				a:id="@+id/function_edit_description"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
+			a:id="@+id/function_edit_description"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="text" />
 
 		<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content">
+
+			<Button
+				a:id="@+id/cancel_button"
+				a:layout_width="0dp"
 				a:layout_height="wrap_content"
-				a:layout_width="match_parent">
+				a:layout_weight="1"
+				a:text="@string/c_cancel" />
 
 			<Button
-					a:id="@+id/cancel_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_cancel"/>
+				a:id="@+id/remove_button"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/c_remove" />
 
 			<Button
-					a:id="@+id/remove_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_remove"/>
-
-			<Button
-					a:id="@+id/save_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_save"/>
+				a:id="@+id/save_button"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/c_save" />
 
 		</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/function_edit_param.xml b/android-app/src/main/res/layout/function_edit_param.xml
index 881ba176..4b4db28e 100644
--- a/android-app/src/main/res/layout/function_edit_param.xml
+++ b/android-app/src/main/res/layout/function_edit_param.xml
@@ -23,37 +23,37 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_height="wrap_content"
-			  a:layout_width="match_parent"
-			  a:orientation="horizontal">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:orientation="horizontal">
 
 	<Button
-			a:id="@+id/function_remove_param_button"
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:text="-"/>
+		a:id="@+id/function_remove_param_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:text="-" />
 
 	<Button
-			a:id="@+id/function_up_param_button"
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:text="↑"/>
+		a:id="@+id/function_up_param_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:text="↑" />
 
 	<Button
-			a:id="@+id/function_down_param_button"
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:text="↓"/>
+		a:id="@+id/function_down_param_button"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:text="↓" />
 
 	<org.solovyev.android.calculator.function.FunctionParamEditText
-			a:id="@+id/function_param_edit_text"
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="3"
-			style="@style/cpp_default_text_size"
-			a:inputType="text"/>
+		a:id="@+id/function_param_edit_text"
+		style="@style/cpp_default_text_size"
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="3"
+		a:inputType="text" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/history_edit.xml b/android-app/src/main/res/layout/history_edit.xml
index a05806e5..9776c58c 100644
--- a/android-app/src/main/res/layout/history_edit.xml
+++ b/android-app/src/main/res/layout/history_edit.xml
@@ -23,47 +23,47 @@
   -->
 
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent">
+
+	<LinearLayout
+		a:id="@+id/history_edit"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="vertical"
+		a:scrollbarAlwaysDrawVerticalTrack="true"
+		a:scrollbars="vertical">
+
+		<TextView
+			style="@style/cpp_default_text_size"
 			a:layout_width="fill_parent"
-			a:layout_height="fill_parent">
-
-	<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-				  a:id="@+id/history_edit"
-				  a:orientation="vertical"
-				  a:layout_width="match_parent"
-				  a:layout_height="wrap_content"
-				  a:scrollbars="vertical"
-				  a:scrollbarAlwaysDrawVerticalTrack="true">
+			a:layout_height="fill_parent"
+			a:padding="6dp"
+			a:text="@string/c_history_expression" />
 
 		<TextView
-				a:layout_height="fill_parent"
-				a:layout_width="fill_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_history_expression"/>
+			a:id="@+id/history_edit_expression"
+			style="@style/cpp_default_text_size"
+			a:layout_width="fill_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:textStyle="bold"></TextView>
 
 		<TextView
-				a:id="@+id/history_edit_expression"
-				a:layout_width="fill_parent"
-				a:padding="6dp"
-				a:textStyle="bold"
-				a:layout_height="wrap_content"
-				style="@style/cpp_default_text_size"></TextView>
-
-		<TextView
-				a:layout_height="fill_parent"
-				a:layout_width="fill_parent"
-				style="@style/cpp_default_text_size"
-				a:padding="6dp"
-				a:text="@string/c_history_comment"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent"
+			a:padding="6dp"
+			a:text="@string/c_history_comment" />
 
 		<EditText
-				a:id="@+id/history_edit_comment"
-				a:layout_width="fill_parent"
-				a:layout_height="wrap_content"
-				a:minLines="4"
-				a:maxLines="4"
-				a:gravity="top|left"
-				style="@style/cpp_default_text_size"></EditText>
+			a:id="@+id/history_edit_comment"
+			style="@style/cpp_default_text_size"
+			a:layout_width="fill_parent"
+			a:layout_height="wrap_content"
+			a:gravity="top|left"
+			a:maxLines="4"
+			a:minLines="4"></EditText>
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml
index c9073b37..ffe32ad3 100644
--- a/android-app/src/main/res/layout/history_item.xml
+++ b/android-app/src/main/res/layout/history_item.xml
@@ -22,37 +22,38 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="horizontal"
-			  style="@style/CppListViewItem">
+<LinearLayout style="@style/CppListViewItem"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="horizontal">
 
 
 	<LinearLayout
-			a:orientation="vertical"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:layout_height="wrap_content">
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:orientation="vertical">
 
 		<TextView
-				a:id="@+id/history_item"
-				a:layout_width="fill_parent"
-				a:layout_height="fill_parent"
-				style="@style/CppListViewItemTextPrimary.History"/>
+			a:id="@+id/history_item"
+			style="@style/CppListViewItemTextPrimary.History"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent" />
 
 		<TextView
 			a:id="@+id/history_time"
+			style="@style/CppListViewItemTextSecondary"
 			a:layout_width="fill_parent"
-			a:layout_height="fill_parent"
-			style="@style/CppListViewItemTextSecondary"/>
+			a:layout_height="fill_parent" />
 
 	</LinearLayout>
 
-	<ImageView a:id="@+id/history_item_status_icon"
-			   a:layout_gravity="center_vertical|right"
-			   a:scaleType="centerInside"
-			   a:src="@drawable/ic_save_grey600_48dp"
-			   a:visibility="gone"
-			   a:layout_width="30dp"
-			   a:layout_height="30dp"/>
+	<ImageView
+		a:id="@+id/history_item_status_icon"
+		a:layout_width="30dp"
+		a:layout_height="30dp"
+		a:layout_gravity="center_vertical|right"
+		a:scaleType="centerInside"
+		a:src="@drawable/ic_save_grey600_48dp"
+		a:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_calculator.xml b/android-app/src/main/res/layout/main_calculator.xml
index c855ee2e..0e23c3c7 100644
--- a/android-app/src/main/res/layout/main_calculator.xml
+++ b/android-app/src/main/res/layout/main_calculator.xml
@@ -22,7 +22,8 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout a:id="@+id/main_layout"
+<LinearLayout
+	a:id="@+id/main_layout"
 	style="@style/CppMain"
 	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
diff --git a/android-app/src/main/res/layout/main_calculator_mobile.xml b/android-app/src/main/res/layout/main_calculator_mobile.xml
index dc7fd21c..014baa2f 100644
--- a/android-app/src/main/res/layout/main_calculator_mobile.xml
+++ b/android-app/src/main/res/layout/main_calculator_mobile.xml
@@ -22,45 +22,45 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:id="@+id/main_layout"
-			  a:orientation="vertical"
-			  style="@style/CppMain">
+<LinearLayout a:id="@+id/main_layout"
+	style="@style/CppMain"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:id="@+id/editorContainer"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"
-			a:orientation="horizontal" />
+		a:id="@+id/editorContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="2"
+		a:orientation="horizontal" />
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include
-				layout="@layout/cpp_app_button_equals"
-				a:layout_weight="1"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
+			layout="@layout/cpp_app_button_equals"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<FrameLayout
-				a:id="@+id/displayContainer"
-				a:layout_weight="4"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"
-				a:orientation="horizontal" />
+			a:id="@+id/displayContainer"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="4"
+			a:orientation="horizontal" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:id="@+id/keyboardContainer"
-			a:layout_weight="5"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"
-			a:orientation="vertical" />
+		a:id="@+id/keyboardContainer"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="5"
+		a:orientation="vertical" />
 
 </LinearLayout>
diff --git a/android-app/src/main/res/layout/main_empty.xml b/android-app/src/main/res/layout/main_empty.xml
index a2e1bb21..5a12d137 100644
--- a/android-app/src/main/res/layout/main_empty.xml
+++ b/android-app/src/main/res/layout/main_empty.xml
@@ -22,9 +22,9 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_layout"
-			  style="@style/CppMain"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_layout"
+	style="@style/CppMain"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/main_empty_multi_pane.xml b/android-app/src/main/res/layout/main_empty_multi_pane.xml
index 0b22da69..563f93de 100644
--- a/android-app/src/main/res/layout/main_empty_multi_pane.xml
+++ b/android-app/src/main/res/layout/main_empty_multi_pane.xml
@@ -22,9 +22,9 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_layout"
-			  style="@style/CppMain.Multipane"
-			  a:orientation="vertical">
+<LinearLayout a:id="@+id/main_layout"
+	style="@style/CppMain.Multipane"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
index ef574ed6..3c28bea3 100644
--- a/android-app/src/main/res/layout/math_entity.xml
+++ b/android-app/src/main/res/layout/math_entity.xml
@@ -22,36 +22,36 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_height="wrap_content"
-			  a:layout_width="match_parent"
-			  style="@style/CppListViewItem"
-			  a:orientation="horizontal">
+<LinearLayout style="@style/CppListViewItem"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:orientation="horizontal">
 
 	<LinearLayout
-			a:layout_height="wrap_content"
-			a:layout_width="0dp"
-			a:layout_weight="1"
-			a:orientation="vertical">
+		a:layout_width="0dp"
+		a:layout_height="wrap_content"
+		a:layout_weight="1"
+		a:orientation="vertical">
 
 		<TextView
-				a:id="@+id/math_entity_text"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/CppListViewItemTextPrimary"/>
+			a:id="@+id/math_entity_text"
+			style="@style/CppListViewItemTextPrimary"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content" />
 
 		<TextView
-				a:id="@+id/math_entity_short_description"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/CppListViewItemTextSecondary"/>
+			a:id="@+id/math_entity_short_description"
+			style="@style/CppListViewItemTextSecondary"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content" />
 	</LinearLayout>
 
 	<ImageView
-			a:id="@+id/math_entity_description_imageview"
-			a:scaleType="centerInside"
-			a:visibility="gone"
-			a:layout_height="match_parent"
-			a:layout_width="wrap_content"/>
+		a:id="@+id/math_entity_description_imageview"
+		a:layout_width="wrap_content"
+		a:layout_height="match_parent"
+		a:scaleType="centerInside"
+		a:visibility="gone" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/matrix_edit_fragment.xml b/android-app/src/main/res/layout/matrix_edit_fragment.xml
index ed08cf5d..a35ee064 100644
--- a/android-app/src/main/res/layout/matrix_edit_fragment.xml
+++ b/android-app/src/main/res/layout/matrix_edit_fragment.xml
@@ -23,59 +23,59 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  xmlns:picker="http://schemas.android.com/apk/res-auto"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	xmlns:picker="http://schemas.android.com/apk/res-auto"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
 	<TextView
-			a:id="@+id/fragmentTitle"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			style="@style/CppFragmentTitle"/>
+		a:id="@+id/fragmentTitle"
+		style="@style/CppFragmentTitle"
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content" />
 
-	<include layout="@layout/ad"/>
+	<include layout="@layout/ad" />
 
 	<LinearLayout
-			a:layout_height="match_parent"
-			a:layout_width="match_parent"
-			a:orientation="vertical">
+		a:layout_width="match_parent"
+		a:layout_height="match_parent"
+		a:orientation="vertical">
 
 		<org.solovyev.android.view.Picker
-				a:id="@+id/matrix_cols_count_picker"
-				a:layout_height="wrap_content"
-				a:layout_width="wrap_content"
-				a:layout_gravity="center"
-				picker:orientation="horizontal"/>
+			a:id="@+id/matrix_cols_count_picker"
+			a:layout_width="wrap_content"
+			a:layout_height="wrap_content"
+			a:layout_gravity="center"
+			picker:orientation="horizontal" />
 
 		<LinearLayout
-				a:layout_height="match_parent"
-				a:layout_width="match_parent"
-				a:orientation="horizontal"
-				a:gravity="center">
+			a:layout_width="match_parent"
+			a:layout_height="match_parent"
+			a:gravity="center"
+			a:orientation="horizontal">
 
 			<org.solovyev.android.view.Picker
-					a:id="@+id/matrix_rows_count_picker"
-					a:layout_height="wrap_content"
-					a:layout_width="wrap_content"/>
+				a:id="@+id/matrix_rows_count_picker"
+				a:layout_width="wrap_content"
+				a:layout_height="wrap_content" />
 
 			<ScrollView
-					a:layout_height="match_parent"
-					a:layout_width="match_parent"
-					a:scrollbars="vertical">
+				a:layout_width="match_parent"
+				a:layout_height="match_parent"
+				a:scrollbars="vertical">
 
 				<HorizontalScrollView
-						a:layout_height="wrap_content"
-						a:layout_width="match_parent"
-						a:minHeight="300dp">
+					a:layout_width="match_parent"
+					a:layout_height="wrap_content"
+					a:minHeight="300dp">
 
 					<org.solovyev.android.calculator.matrix.MatrixView
-							a:id="@+id/matrix_layout"
-							a:layout_height="match_parent"
-							a:layout_width="wrap_content"
-							a:minWidth="300dp"/>
+						a:id="@+id/matrix_layout"
+						a:layout_width="wrap_content"
+						a:layout_height="match_parent"
+						a:minWidth="300dp" />
 
 				</HorizontalScrollView>
 
diff --git a/android-app/src/main/res/layout/matrix_edit_fragment_item.xml b/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
index f1d4c823..b73ab996 100644
--- a/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
+++ b/android-app/src/main/res/layout/matrix_edit_fragment_item.xml
@@ -23,13 +23,13 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_height="match_parent"
-			  a:layout_width="match_parent">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent">
 
 	<EditText
-			a:id="@+id/matrix_element_edittext"
-			a:layout_height="match_parent"
-			a:layout_width="match_parent"
-			a:text="test"/>
+		a:id="@+id/matrix_element_edittext"
+		a:layout_width="match_parent"
+		a:layout_height="match_parent"
+		a:text="test" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/notespp_announce.xml b/android-app/src/main/res/layout/notespp_announce.xml
index 962005fc..f4f9568c 100644
--- a/android-app/src/main/res/layout/notespp_announce.xml
+++ b/android-app/src/main/res/layout/notespp_announce.xml
@@ -23,14 +23,14 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent">
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent">
 
 	<TextView
-			a:id="@+id/notespp_announce"
-			style="@style/CppText.About"
-			a:layout_width="fill_parent"
-			a:text="@string/c_notespp_announce_text"
-			a:layout_height="fill_parent"/>
+		a:id="@+id/notespp_announce"
+		style="@style/CppText.About"
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:text="@string/c_notespp_announce_text" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/onscreen_display.xml b/android-app/src/main/res/layout/onscreen_display.xml
index d4e21f08..20541e61 100644
--- a/android-app/src/main/res/layout/onscreen_display.xml
+++ b/android-app/src/main/res/layout/onscreen_display.xml
@@ -6,11 +6,11 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.calculator.AndroidCalculatorDisplayView xmlns:a="http://schemas.android.com/apk/res/android"
-															  a:id="@+id/calculator_display"
-															  style="@style/CppText.Display.Onscreen"
-															  a:padding="@dimen/cpp_display_padding"
-															  a:inputType="textMultiLine"
-															  a:maxLines="3"
-															  a:scrollHorizontally="false"
-															  a:scrollbars="none"/>
\ No newline at end of file
+<org.solovyev.android.calculator.AndroidCalculatorDisplayView a:id="@+id/calculator_display"
+	style="@style/CppText.Display.Onscreen"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:inputType="textMultiLine"
+	a:maxLines="3"
+	a:padding="@dimen/cpp_display_padding"
+	a:scrollHorizontally="false"
+	a:scrollbars="none" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/onscreen_editor.xml b/android-app/src/main/res/layout/onscreen_editor.xml
index 742b8dd2..918b1c31 100644
--- a/android-app/src/main/res/layout/onscreen_editor.xml
+++ b/android-app/src/main/res/layout/onscreen_editor.xml
@@ -6,16 +6,16 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:padding="@dimen/cpp_editor_padding">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:padding="@dimen/cpp_editor_padding">
 
 	<org.solovyev.android.calculator.AndroidCalculatorEditorView
-			a:id="@+id/calculator_editor"
-			style="@style/cpp_onscreen_editor_style"
-			a:textIsSelectable="true"/>
+		a:id="@+id/calculator_editor"
+		style="@style/cpp_onscreen_editor_style"
+		a:textIsSelectable="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/onscreen_footer.xml b/android-app/src/main/res/layout/onscreen_footer.xml
index 61afbb42..c30aec09 100644
--- a/android-app/src/main/res/layout/onscreen_footer.xml
+++ b/android-app/src/main/res/layout/onscreen_footer.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:orientation="horizontal"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content">
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/onscreen_header.xml b/android-app/src/main/res/layout/onscreen_header.xml
index 6d178010..7cc42817 100644
--- a/android-app/src/main/res/layout/onscreen_header.xml
+++ b/android-app/src/main/res/layout/onscreen_header.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:a="http://schemas.android.com/apk/res/android"
-				a:layout_width="match_parent"
-				a:layout_height="30dp">
+	a:layout_width="match_parent"
+	a:layout_height="30dp">
 
 	<LinearLayout
-			a:id="@+id/onscreen_header_buttons"
-			a:layout_width="wrap_content"
-			a:layout_height="match_parent"
-			a:layout_alignParentRight="true">
+		a:id="@+id/onscreen_header_buttons"
+		a:layout_width="wrap_content"
+		a:layout_height="match_parent"
+		a:layout_alignParentRight="true">
 
 		<ImageButton
-				a:id="@+id/onscreen_fold_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_fold"/>
+			a:id="@+id/onscreen_fold_button"
+			style="@style/onscreen_header_button_style"
+			a:src="@drawable/cpp_onscreen_button_fold" />
 
 		<ImageButton
-				a:id="@+id/onscreen_minimize_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_minimize"/>
+			a:id="@+id/onscreen_minimize_button"
+			style="@style/onscreen_header_button_style"
+			a:src="@drawable/cpp_onscreen_button_minimize" />
 
 		<ImageButton
-				a:id="@+id/onscreen_close_button"
-				style="@style/onscreen_header_button_style"
-				a:src="@drawable/cpp_onscreen_button_close"/>
+			a:id="@+id/onscreen_close_button"
+			style="@style/onscreen_header_button_style"
+			a:src="@drawable/cpp_onscreen_button_close" />
 
 	</LinearLayout>
 
 	<ImageView
-			a:id="@+id/onscreen_title"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent"
-			a:src="@drawable/cpp_onscreen_header_logo"
-			a:scaleType="fitStart"
-			a:paddingLeft="6dp"
-			a:paddingTop="2dp"
-			a:paddingBottom="2dp"
-			a:layout_toLeftOf="@id/onscreen_header_buttons"/>
+		a:id="@+id/onscreen_title"
+		a:layout_width="match_parent"
+		a:layout_height="match_parent"
+		a:layout_toLeftOf="@id/onscreen_header_buttons"
+		a:paddingBottom="2dp"
+		a:paddingLeft="6dp"
+		a:paddingTop="2dp"
+		a:scaleType="fitStart"
+		a:src="@drawable/cpp_onscreen_header_logo" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/onscreen_keyboard.xml b/android-app/src/main/res/layout/onscreen_keyboard.xml
index 44c43dd4..997d2783 100644
--- a/android-app/src/main/res/layout/onscreen_keyboard.xml
+++ b/android-app/src/main/res/layout/onscreen_keyboard.xml
@@ -1,74 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical">
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_7"/>
+		<include layout="@layout/cpp_simple_button_7" />
 
-		<include layout="@layout/cpp_simple_button_8"/>
+		<include layout="@layout/cpp_simple_button_8" />
 
-		<include layout="@layout/cpp_simple_button_9"/>
+		<include layout="@layout/cpp_simple_button_9" />
 
-		<include layout="@layout/cpp_simple_button_multiplication"/>
+		<include layout="@layout/cpp_simple_button_multiplication" />
 
-		<include layout="@layout/cpp_simple_button_erase"/>
+		<include layout="@layout/cpp_simple_button_erase" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_4"/>
+		<include layout="@layout/cpp_simple_button_4" />
 
-		<include layout="@layout/cpp_simple_button_5"/>
+		<include layout="@layout/cpp_simple_button_5" />
 
-		<include layout="@layout/cpp_simple_button_6"/>
+		<include layout="@layout/cpp_simple_button_6" />
 
-		<include layout="@layout/cpp_simple_button_division"/>
+		<include layout="@layout/cpp_simple_button_division" />
 
-		<include layout="@layout/cpp_simple_button_percent"/>
+		<include layout="@layout/cpp_simple_button_percent" />
 
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_1"/>
+		<include layout="@layout/cpp_simple_button_1" />
 
-		<include layout="@layout/cpp_simple_button_2"/>
+		<include layout="@layout/cpp_simple_button_2" />
 
-		<include layout="@layout/cpp_simple_button_3"/>
+		<include layout="@layout/cpp_simple_button_3" />
 
-		<include layout="@layout/cpp_simple_button_plus"/>
+		<include layout="@layout/cpp_simple_button_plus" />
 
-		<include layout="@layout/cpp_simple_button_power"/>
+		<include layout="@layout/cpp_simple_button_power" />
 	</LinearLayout>
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
-		<include layout="@layout/cpp_simple_button_round_brackets"/>
+		<include layout="@layout/cpp_simple_button_round_brackets" />
 
-		<include layout="@layout/cpp_simple_button_0"/>
+		<include layout="@layout/cpp_simple_button_0" />
 
-		<include layout="@layout/cpp_simple_button_dot"/>
+		<include layout="@layout/cpp_simple_button_dot" />
 
-		<include layout="@layout/cpp_simple_button_subtraction"/>
+		<include layout="@layout/cpp_simple_button_subtraction" />
 
-		<include layout="@layout/cpp_simple_button_app"/>
+		<include layout="@layout/cpp_simple_button_app" />
 
 	</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/onscreen_layout.xml b/android-app/src/main/res/layout/onscreen_layout.xml
index 5153e6a2..6cb83f26 100644
--- a/android-app/src/main/res/layout/onscreen_layout.xml
+++ b/android-app/src/main/res/layout/onscreen_layout.xml
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  style="@style/CppMain.Onscreen">
+<LinearLayout style="@style/CppMain.Onscreen"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical">
 
 	<include
-			a:id="@+id/onscreen_header"
-			layout="@layout/onscreen_header"/>
+		a:id="@+id/onscreen_header"
+		layout="@layout/onscreen_header" />
 
 	<LinearLayout
-			a:id="@+id/onscreen_content"
-			a:orientation="vertical"
-			a:layout_width="match_parent"
-			a:layout_height="match_parent">
+		a:id="@+id/onscreen_content"
+		a:layout_width="match_parent"
+		a:layout_height="match_parent"
+		a:orientation="vertical">
 
 		<include
-				layout="@layout/onscreen_editor"
-				a:layout_width="match_parent"
-				a:layout_height="wrap_content"/>
+			layout="@layout/onscreen_editor"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content" />
 
 		<LinearLayout
-				a:layout_weight="1"
-				a:layout_width="match_parent"
-				a:layout_height="0dp">
+			a:layout_width="match_parent"
+			a:layout_height="0dp"
+			a:layout_weight="1">
 
 			<include
-					layout="@layout/cpp_simple_button_equals"
-					a:layout_weight="1"
-					a:layout_width="0dp"
-					a:layout_height="match_parent"/>
+				layout="@layout/cpp_simple_button_equals"
+				a:layout_width="0dp"
+				a:layout_height="match_parent"
+				a:layout_weight="1" />
 
 			<include
-					layout="@layout/onscreen_display"
-					a:layout_weight="4"
-					a:layout_width="0dp"
-					a:layout_height="wrap_content"/>
+				layout="@layout/onscreen_display"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="4" />
 
 		</LinearLayout>
 
 		<include
-				layout="@layout/onscreen_keyboard"
-				a:layout_weight="4"
-				a:layout_width="match_parent"
-				a:layout_height="0dp"/>
+			layout="@layout/onscreen_keyboard"
+			a:layout_width="match_parent"
+			a:layout_height="0dp"
+			a:layout_weight="4" />
 	</LinearLayout>
 
-	<include layout="@layout/onscreen_footer"/>
+	<include layout="@layout/onscreen_footer" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/release_notes_fragment.xml b/android-app/src/main/res/layout/release_notes_fragment.xml
index 397a0fb9..bfba42da 100644
--- a/android-app/src/main/res/layout/release_notes_fragment.xml
+++ b/android-app/src/main/res/layout/release_notes_fragment.xml
@@ -23,18 +23,18 @@
   -->
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:orientation="vertical"
-			  a:layout_width="fill_parent"
-			  a:layout_height="fill_parent">
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent"
+	a:orientation="vertical">
 
 	<TextView
-			a:id="@+id/releaseNotesTextView"
-			a:layout_height="fill_parent"
-			a:layout_width="fill_parent"
-			a:layout_weight="1"
-			a:gravity="top|left"
-			a:scrollbars="vertical"
-			style="@style/CppText.About"/>
+		a:id="@+id/releaseNotesTextView"
+		style="@style/CppText.About"
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:layout_weight="1"
+		a:gravity="top|left"
+		a:scrollbars="vertical" />
 
 	<!--
 			a:scrollbarFadeDuration="0" is not support in  android_1.6_compatibility
diff --git a/android-app/src/main/res/layout/saved_history_item.xml b/android-app/src/main/res/layout/saved_history_item.xml
index 44fc2d6a..2bebe46a 100644
--- a/android-app/src/main/res/layout/saved_history_item.xml
+++ b/android-app/src/main/res/layout/saved_history_item.xml
@@ -22,25 +22,25 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-	a:orientation="vertical"
-	style="@style/CppListViewItem">
+<LinearLayout style="@style/CppListViewItem"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:orientation="vertical">
 
 	<TextView
 		a:id="@+id/history_item"
+		style="@style/CppListViewItemTextPrimary.History"
 		a:layout_width="fill_parent"
-		a:layout_height="fill_parent"
-		style="@style/CppListViewItemTextPrimary.History" />
+		a:layout_height="fill_parent" />
 
 	<TextView
 		a:id="@+id/history_item_comment"
+		style="@style/CppListViewItemTextSecondary"
 		a:layout_width="fill_parent"
-		a:layout_height="fill_parent"
-		style="@style/CppListViewItemTextSecondary" />
+		a:layout_height="fill_parent" />
 
 	<TextView
 		a:id="@+id/history_time"
+		style="@style/CppListViewItemTextSecondary"
 		a:layout_width="fill_parent"
-		a:layout_height="fill_parent"
-		style="@style/CppListViewItemTextSecondary" />
+		a:layout_height="fill_parent" />
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/tabs.xml b/android-app/src/main/res/layout/tabs.xml
index 201a0245..2d312f8b 100644
--- a/android-app/src/main/res/layout/tabs.xml
+++ b/android-app/src/main/res/layout/tabs.xml
@@ -22,25 +22,25 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<TabHost xmlns:a="http://schemas.android.com/apk/res/android"
-		 a:id="@android:id/tabhost"
-		 a:layout_width="fill_parent"
-		 a:layout_height="fill_parent">
+<TabHost a:id="@android:id/tabhost"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="fill_parent"
+	a:layout_height="fill_parent">
 
 	<LinearLayout
-			a:orientation="vertical"
-			a:layout_width="fill_parent"
-			a:layout_height="fill_parent">
+		a:layout_width="fill_parent"
+		a:layout_height="fill_parent"
+		a:orientation="vertical">
 
 		<TabWidget
-				a:id="@android:id/tabs"
-				a:layout_width="fill_parent"
-				a:layout_height="wrap_content"/>
+			a:id="@android:id/tabs"
+			a:layout_width="fill_parent"
+			a:layout_height="wrap_content" />
 
 		<FrameLayout
-				a:id="@android:id/tabcontent"
-				a:layout_width="fill_parent"
-				a:layout_height="fill_parent"/>
+			a:id="@android:id/tabcontent"
+			a:layout_width="fill_parent"
+			a:layout_height="fill_parent" />
 
 	</LinearLayout>
 </TabHost>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/var_edit.xml b/android-app/src/main/res/layout/var_edit.xml
index c9748df0..83350141 100644
--- a/android-app/src/main/res/layout/var_edit.xml
+++ b/android-app/src/main/res/layout/var_edit.xml
@@ -23,96 +23,96 @@
   -->
 
 <ScrollView xmlns:a="http://schemas.android.com/apk/res/android"
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:minWidth="300dp">
+	a:layout_width="match_parent"
+	a:layout_height="wrap_content"
+	a:minWidth="300dp">
 
 	<LinearLayout
-			a:layout_height="wrap_content"
-			a:layout_width="match_parent"
-			a:orientation="vertical">
+		a:layout_width="match_parent"
+		a:layout_height="wrap_content"
+		a:orientation="vertical">
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_var_name"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_var_name" />
 
 		<EditText
-				a:id="@+id/var_edit_name"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
+			a:id="@+id/var_edit_name"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="text" />
 
 		<TextView
 			a:id="@+id/var_toggle_greek_keyboard"
-			a:text="@string/cpp_var_show_greek_keyboard"
-			a:layout_height="wrap_content"
+			style="@style/cpp_default_text_size"
 			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
 			a:padding="6dp"
-			style="@style/cpp_default_text_size" />
+			a:text="@string/cpp_var_show_greek_keyboard" />
 
 		<LinearLayout
 			a:id="@+id/var_greek_keyboard"
-			a:visibility="gone"
 			a:layout_width="match_parent"
 			a:layout_height="wrap_content"
-			a:orientation="vertical"/>
+			a:orientation="vertical"
+			a:visibility="gone" />
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:padding="6dp"
-				a:text="@string/c_var_value"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_var_value" />
 
 		<EditText
-				a:id="@+id/var_edit_value"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="numberDecimal"/>
+			a:id="@+id/var_edit_value"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="numberDecimal" />
 
 		<TextView
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				a:padding="6dp"
-				style="@style/cpp_default_text_size"
-				a:text="@string/c_var_description"/>
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:padding="6dp"
+			a:text="@string/c_var_description" />
 
 		<EditText
-				a:id="@+id/var_edit_description"
-				a:layout_height="wrap_content"
-				a:layout_width="match_parent"
-				style="@style/cpp_default_text_size"
-				a:inputType="text"/>
+			a:id="@+id/var_edit_description"
+			style="@style/cpp_default_text_size"
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content"
+			a:inputType="text" />
 
 		<LinearLayout
+			a:layout_width="match_parent"
+			a:layout_height="wrap_content">
+
+			<Button
+				a:id="@+id/cancel_button"
+				a:layout_width="0dp"
 				a:layout_height="wrap_content"
-				a:layout_width="match_parent">
+				a:layout_weight="1"
+				a:text="@string/c_cancel" />
 
 			<Button
-					a:id="@+id/cancel_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_cancel"/>
+				a:id="@+id/remove_button"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/c_remove" />
 
 			<Button
-					a:id="@+id/remove_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_remove"/>
-
-			<Button
-					a:id="@+id/save_button"
-					a:layout_height="wrap_content"
-					a:layout_width="0dp"
-					a:layout_weight="1"
-					a:text="@string/c_save"/>
+				a:id="@+id/save_button"
+				a:layout_width="0dp"
+				a:layout_height="wrap_content"
+				a:layout_weight="1"
+				a:text="@string/c_save" />
 
 		</LinearLayout>
 
diff --git a/android-app/src/main/res/layout/widget_display.xml b/android-app/src/main/res/layout/widget_display.xml
index e64b7c11..c0741c2b 100644
--- a/android-app/src/main/res/layout/widget_display.xml
+++ b/android-app/src/main/res/layout/widget_display.xml
@@ -6,10 +6,10 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<TextView xmlns:a="http://schemas.android.com/apk/res/android"
-		  a:id="@+id/calculator_display"
-		  style="@style/cpp_widget_display_style"
-		  a:textIsSelectable="true"
-		  a:padding="@dimen/cpp_display_padding"
-		  a:singleLine="false"
-		  a:scrollbars="vertical"/>
\ No newline at end of file
+<TextView a:id="@+id/calculator_display"
+	style="@style/cpp_widget_display_style"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:padding="@dimen/cpp_display_padding"
+	a:scrollbars="vertical"
+	a:singleLine="false"
+	a:textIsSelectable="true" />
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_editor.xml b/android-app/src/main/res/layout/widget_editor.xml
index 70813b00..8ae87032 100644
--- a/android-app/src/main/res/layout/widget_editor.xml
+++ b/android-app/src/main/res/layout/widget_editor.xml
@@ -6,19 +6,19 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:id="@+id/main_fragment_layout"
-			  style="@style/CppFragment"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:padding="@dimen/cpp_editor_padding">
+<LinearLayout a:id="@+id/main_fragment_layout"
+	style="@style/CppFragment"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:padding="@dimen/cpp_editor_padding">
 
 	<TextView
-			a:id="@+id/calculator_editor"
-			style="@style/cpp_widget_editor_style"
-			a:textIsSelectable="true"
-			a:singleLine="false"
-			a:scrollbars="vertical"
-			a:hint="@string/c_calc_editor_hint"/>
+		a:id="@+id/calculator_editor"
+		style="@style/cpp_widget_editor_style"
+		a:hint="@string/c_calc_editor_hint"
+		a:scrollbars="vertical"
+		a:singleLine="false"
+		a:textIsSelectable="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout.xml b/android-app/src/main/res/layout/widget_layout.xml
index 59fca380..36f51bb8 100644
--- a/android-app/src/main/res/layout/widget_layout.xml
+++ b/android-app/src/main/res/layout/widget_layout.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-			  a:layout_width="match_parent"
-			  a:layout_height="match_parent"
-			  a:orientation="vertical"
-			  style="@style/CppMain.Widget">
+<LinearLayout style="@style/CppMain.Widget"
+	xmlns:a="http://schemas.android.com/apk/res/android"
+	a:layout_width="match_parent"
+	a:layout_height="match_parent"
+	a:orientation="vertical">
 
 	<include
-			layout="@layout/widget_editor"
-			a:layout_weight="2"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		layout="@layout/widget_editor"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="2" />
 
 	<LinearLayout
-			a:layout_weight="1"
-			a:layout_width="match_parent"
-			a:layout_height="0dp">
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include
-				layout="@layout/cpp_simple_button_equals"
-				a:layout_weight="1"
-				a:layout_width="0dp"
-				a:layout_height="match_parent"/>
+			layout="@layout/cpp_simple_button_equals"
+			a:layout_width="0dp"
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<include
-				layout="@layout/widget_display"
-				a:layout_weight="5"
-				a:layout_width="0dp"
-				a:layout_height="wrap_content"/>
+			layout="@layout/widget_display"
+			a:layout_width="0dp"
+			a:layout_height="wrap_content"
+			a:layout_weight="5" />
 
 	</LinearLayout>
 
 	<include
-			layout="@layout/cpp_simple_keyboard"
-			a:layout_weight="5"
-			a:layout_width="match_parent"
-			a:layout_height="0dp"/>
+		layout="@layout/cpp_simple_keyboard"
+		a:layout_width="match_parent"
+		a:layout_height="0dp"
+		a:layout_weight="5" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen.xml b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
index f9573e27..e86c2761 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen.xml
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+<LinearLayout style="@style/CppMain.Widget"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	style="@style/CppMain.Widget">
+	a:orientation="vertical">
 
 	<include
 		layout="@layout/widget_editor"
-		a:layout_weight="2"
 		a:layout_width="match_parent"
-		a:layout_height="0dp" />
+		a:layout_height="0dp"
+		a:layout_weight="2" />
 
 	<LinearLayout
-		a:layout_weight="1"
 		a:layout_width="match_parent"
-		a:layout_height="0dp">
+		a:layout_height="0dp"
+		a:layout_weight="1">
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
-			a:layout_weight="1"
 			a:layout_width="0dp"
-			a:layout_height="match_parent" />
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<include
 			layout="@layout/widget_display"
-			a:layout_weight="5"
 			a:layout_width="0dp"
-			a:layout_height="match_parent" />
+			a:layout_height="match_parent"
+			a:layout_weight="5" />
 
 	</LinearLayout>
 
 	<include
 		layout="@layout/cpp_simple_keyboard_lockscreen"
-		a:layout_weight="4"
 		a:layout_width="match_parent"
-		a:layout_height="0dp" />
+		a:layout_height="0dp"
+		a:layout_weight="4" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
index ba97d71e..88f7dcea 100644
--- a/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
+++ b/android-app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+<LinearLayout style="@style/CppMain.Widget"
+	xmlns:a="http://schemas.android.com/apk/res/android"
 	a:layout_width="match_parent"
 	a:layout_height="match_parent"
-	a:orientation="vertical"
-	style="@style/CppMain.Widget">
+	a:orientation="vertical">
 
 	<LinearLayout
 		a:id="@+id/main_fragment_layout"
 		style="@style/CppFragment"
-		a:orientation="horizontal"
 		a:layout_width="match_parent"
 		a:layout_height="0dp"
 		a:layout_weight="2"
+		a:orientation="horizontal"
 		a:padding="0dp">
 
 		<TextView
-			a:padding="@dimen/cpp_editor_padding"
-			a:layout_weight="3"
-			a:layout_width="0dp"
 			a:id="@+id/calculator_editor"
 			style="@style/cpp_widget_editor_style"
-			a:textSize="@dimen/cpp_widget_editor_text_size_collapsed"
+			a:layout_width="0dp"
+			a:layout_weight="3"
 			a:gravity="center_vertical|left"
-			a:textIsSelectable="true"
-			a:singleLine="false"
+			a:hint="@string/c_calc_editor_hint"
+			a:padding="@dimen/cpp_editor_padding"
 			a:scrollbars="vertical"
-			a:hint="@string/c_calc_editor_hint"/>
+			a:singleLine="false"
+			a:textIsSelectable="true"
+			a:textSize="@dimen/cpp_widget_editor_text_size_collapsed" />
 
 		<include
 			layout="@layout/cpp_simple_button_equals"
-			a:layout_weight="1"
 			a:layout_width="0dp"
-			a:layout_height="match_parent" />
+			a:layout_height="match_parent"
+			a:layout_weight="1" />
 
 		<TextView
 			a:id="@+id/calculator_display"
-			a:textSize="@dimen/cpp_widget_display_text_size_collapsed"
-			a:layout_weight="2"
+			style="@style/cpp_widget_display_style"
 			a:layout_width="0dp"
 			a:layout_height="wrap_content"
-			style="@style/cpp_widget_display_style"
-			a:textIsSelectable="true"
+			a:layout_weight="2"
 			a:padding="@dimen/cpp_display_padding"
+			a:scrollbars="vertical"
 			a:singleLine="false"
-			a:scrollbars="vertical"/>
+			a:textIsSelectable="true"
+			a:textSize="@dimen/cpp_widget_display_text_size_collapsed" />
 
 	</LinearLayout>
 
 	<include
 		layout="@layout/cpp_simple_keyboard_lockscreen_collapsed"
-		a:layout_weight="4"
 		a:layout_width="match_parent"
-		a:layout_height="0dp" />
+		a:layout_height="0dp"
+		a:layout_weight="4" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-de/strings.xml b/android-app/src/main/res/values-de/strings.xml
deleted file mode 100644
index 7be0abb2..00000000
--- a/android-app/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Wollen Sie den Assistenten wirklich beenden?</string>
-	<string name="acl_wizard_next">Weiter</string>
-	<string name="acl_wizard_back">Zurück</string>
-	<string name="acl_wizard_finish">Beenden</string>
-	<string name="acl_wizard_start">Wizard starten</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-es/strings.xml b/android-app/src/main/res/values-es/strings.xml
deleted file mode 100644
index fb19f02e..00000000
--- a/android-app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">¿Realmente quiere finalizar el asistente?</string>
-	<string name="acl_wizard_next">Siguiente</string>
-	<string name="acl_wizard_back">Atrás</string>
-	<string name="acl_wizard_finish">Finalizar</string>
-	<string name="acl_wizard_start">Iniciar el asistente</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-es/text_wizard.xml b/android-app/src/main/res/values-es/text_wizard.xml
index aba25588..065ee45b 100644
--- a/android-app/src/main/res/values-es/text_wizard.xml
+++ b/android-app/src/main/res/values-es/text_wizard.xml
@@ -35,4 +35,5 @@ El resultado no se redondea, y los radianes son la unidad de ángulo predetermin
   <string name="cpp_wizard_onscreen_checkbox">Activar la calculadora en ventana independiente (aparecerá un segundo icono en la lista de aplicaciones)</string>
   <string name="cpp_wizard_dragbutton_description">El botón de arrastre es una característica exclusiva de Calculadora ++ que proporciona un acceso rápido a las funciones secundarias</string>
   <string name="cpp_wizard_finish_confirmation">¿Realmente quiere finalizar el asistente?</string>
+	<string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
diff --git a/android-app/src/main/res/values-fr/strings.xml b/android-app/src/main/res/values-fr/strings.xml
deleted file mode 100644
index 2d119b94..00000000
--- a/android-app/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Quitter l\'assistant ?</string>
-	<string name="acl_wizard_next">Suivant</string>
-	<string name="acl_wizard_back">Retour</string>
-	<string name="acl_wizard_finish">Terminer</string>
-	<string name="acl_wizard_start">Commencer l\'assistant</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-it/strings.xml b/android-app/src/main/res/values-it/strings.xml
deleted file mode 100644
index f210fae5..00000000
--- a/android-app/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Vuoi veramente terminare la procedura guidata?</string>
-	<string name="acl_wizard_next">Successivo</string>
-	<string name="acl_wizard_back">Indietro</string>
-	<string name="acl_wizard_finish">Termina</string>
-	<string name="acl_wizard_start">Avvia la procedura guidata</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-pl/strings.xml b/android-app/src/main/res/values-pl/strings.xml
deleted file mode 100644
index 7558c1df..00000000
--- a/android-app/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Czy na pewno chcesz zakończyć konfigurację programu?</string>
-	<string name="acl_wizard_next">Następny</string>
-	<string name="acl_wizard_back">Wstecz</string>
-	<string name="acl_wizard_finish">Koniec</string>
-	<string name="acl_wizard_start">Zacznij konfigurację</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-pt-rBR/strings.xml b/android-app/src/main/res/values-pt-rBR/strings.xml
deleted file mode 100644
index e3fafa13..00000000
--- a/android-app/src/main/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Parar a configuração da aplicação?</string>
-	<string name="acl_wizard_next">Avançar</string>
-	<string name="acl_wizard_back">Voltar</string>
-	<string name="acl_wizard_finish">Terminar</string>
-	<string name="acl_wizard_start">Iniciar assistente de configuração</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-pt-rbr/text_about.xml b/android-app/src/main/res/values-pt-rbr/text_about.xml
deleted file mode 100644
index 2a7b49fe..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_about.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_about">Sobre...</string>
-  <string name="c_about_content">Copyright © 2009–2013\n\n<b>Criado por: serso aka se.solovyev</b>\n\n
-		Estamos no Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
-		Este programa é distribuído sob a Licença Apache 2.0\no código fonte pode ser encontrado em:
-		<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
-		Para mais informações,\ncontate o autor por email\n
-		<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
-		\nou visite\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
-		Se você quer colaborar com o projeto\npode comprar uma opção especial nas Preferências\n\n
-		Se você gosta da aplicação\navalie-a com 5 estrelas no\n
-		<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
-		Essa aplicação usa as seguintes bibliotecas Open Source:\n
-		<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n
-		<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>
-	</string>
-  <string name="cpp_translators_text">Este aplicativo foi traduzido para o Português do Brasil por: </string>
-  <string name="cpp_translators_list">Sergey Solovyev</string>
-  <string name="c_release_notes">Notas de lançamento</string>
-  <string name="c_release_notes_for_title">"Notas de lançamento para a versão"</string>
-  <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_functions.xml b/android-app/src/main/res/values-pt-rbr/text_functions.xml
deleted file mode 100644
index a7f1ae0f..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_functions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_functions">Funções</string>
-  <string name="c_fun_description_sin">Função trigonométrica seno</string>
-  <string name="c_fun_description_cos">Função trigonométrica cosseno</string>
-  <string name="c_fun_description_tan">Função tangente trigonométrica</string>
-  <string name="c_fun_description_cot">Função cotangente trigonométrica</string>
-  <string name="c_fun_description_asin">Arco-seno - função seno inversa</string>
-  <string name="c_fun_description_acos">Arco-cosseno - função cosseno inversa</string>
-  <string name="c_fun_description_atan">Arco-tangente - função tangente inversa</string>
-  <string name="c_fun_description_acot">Arco-cotangente - função cotangente inversa</string>
-  <string name="c_fun_description_ln">Logaritmo natural - logaritmo de base e</string>
-  <string name="c_fun_description_lg">Logaritmo Decimal - logaritmo de base 10</string>
-  <string name="c_fun_description_log">Logaritmo - logaritmo na base especificada</string>
-  <string name="c_fun_description_exp">Função exponencial</string>
-  <string name="c_fun_description_sqrt">Função raiz quadrada</string>
-  <string name="c_fun_description_cubic">Função raiz cúbica</string>
-  <string name="c_fun_description_abs">Dá o valor absoluto de um argumento</string>
-  <string name="c_fun_description_sgn">Dá o sinal de um argumento: -1 se um argumento for menor que 0. 0 se for igual a 0 ou 1, se maior que 0.</string>
-  <string name="c_fun_description_eq">Função Igualdade - retorna 1 se dois argumentos são iguais, caso contrário 0.</string>
-  <string name="c_fun_description_le">Função de menor-ou-igual - retorna 1 se dois argumentos são iguais, ou a primeira é menor que o segundo, caso contrário, 0. </string>
-  <string name="c_fun_description_ge">Função maior-ou-igual - retorna 1 se dois argumentos são iguais, ou se o primeira é maior do que o segundo, caso contrário 0.</string>
-  <string name="c_fun_description_ne">Função Não-Igual - retorna 1 se dois argumentos não são iguais, caso contrário 0  </string>
-  <string name="c_fun_description_lt">Função menor - retorna 1 se o primeiro argumento é menor que o segundo, caso contrário, 0.</string>
-  <string name="c_fun_description_gt">Função maior - retorna 1 se o primeiro argumento for maior que o segundo, do contrário 0.</string>
-  <string name="c_fun_description_rad">Converte graus em radianos: g - graus, m - minutos (padrão = 0), s - segundos (padrão = 0).</string>
-  <string name="c_fun_description_dms">Converte graus de notação GMS para notação decimal: g - graus, m - minutos (padrão = 0), s - segundos (padrão = 0).</string>
-  <string name="c_fun_description_deg">Converte radianos em graus</string>
-  <string name="c_fun_category_trig">Trigonométricas</string>
-  <string name="c_fun_category_hyper_trig">Trigonometria hiperbólica</string>
-  <string name="c_fun_category_comparison">Comparação</string>
-  <string name="c_fun_category_common">Comum</string>
-  <string name="c_fun_category_my">Meu</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_operators.xml b/android-app/src/main/res/values-pt-rbr/text_operators.xml
deleted file mode 100644
index a6742f67..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_operators.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_operators">Operadores</string>
-  <string name="c_op_description_mod">Operação Módulo encontra o resto da divisão de \'x\' por \'y\'</string>
-  <string name="c_op_description_sum">Soma a função \'f(i)\', iterando \'i\' de \'from\' até \'to\'
-	</string>
-  <string name="c_op_description_product">Dá o produto de funções \'f(i)\', Iterando \'i\' de \'from\' até \'to\'</string>
-  <string name="c_op_description_derivative">Dá derivada de ordem \'ordem\' (padrão = 1) das funções \'f(x)\' por \'x\' variante e calcula sua derivada no ponto \'x\' (padrão = mesmo como \'x\')</string>
-  <string name="c_op_description_integral">Dá a integral de uma função f (x) por \'x\'</string>
-  <string name="c_op_description_integral_ab">Integra a função f (x) por \'x\' variando de \'a\' para \'b\'</string>
-  <string name="c_pf_description_factorial">Dá o fatorial da expressão anterior</string>
-  <string name="c_pf_description_double_factorial">Dá o fatorial duplo da expressão anterior</string>
-  <string name="c_pf_description_percent" formatted="false">Dá o valor percentual da expressão seguine.\nExemplo:\n a expressão 100 + 50% = 150\n 100 * 50% = 50\n * 100 + 100 * 50% * 50% = 125</string>
-  <string name="c_pf_description_degree">Converte graus em radianos. \n Exemplo:\n 268 ° = 4.67748\n ° 30,21 = 0.52726</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_preferences.xml b/android-app/src/main/res/values-pt-rbr/text_preferences.xml
deleted file mode 100644
index 8a63521b..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_preferences.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_auto_orientation_title">Auto-rotação da tela</string>
-  <string name="c_auto_orientation_summary">Quando ativado, o app gira a tela de acordo com o dispositivo</string>
-  <string name="c_show_equals_button_title">Mostrar o botão igual</string>
-  <string name="c_show_equals_button_summary">Quando marcado, o botão igual será apresentado</string>
-  <string name="c_hide_numeral_base_digits_title">Esconder dígitos de outros sistemas numéricos</string>
-  <string name="c_hide_numeral_base_digits_summary">Se ligado, os números de outras bases numéricas serão ocultados</string>
-  <string name="prefs_history_show_intermediate_calculations_title">Mostrar os cálculos intermédios no historico</string>
-  <string name="prefs_history_show_intermediate_calculations_summary">Quando marcado, todos os calculos serão mostrados na tela de histórico</string>
-  <string name="p_calculations_calculate_on_fly_title">Resultado é calculado durante a digitação</string>
-  <string name="p_calculations_calculate_on_fly_summary">Quando marcado, os cálculos são feitos automaticamente durante a digitação</string>
-  <string name="prefs_prevent_screen_from_fading_title">Evitar que a tela se apague</string>
-  <string name="prefs_prevent_screen_from_fading_summary">Quando ativado, evita que a tela desligue enquanto usa o app</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_strings.xml b/android-app/src/main/res/values-pt-rbr/text_strings.xml
deleted file mode 100644
index 92ab3252..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_strings.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_app_name">Calculator++</string>
-  <string name="c_app_name_on_screen">Calculator++ (Modo Janela)</string>
-  <string name="c_app_icon_name">Calc++</string>
-  <string name="c_app_settings">Configurações</string>
-  <string name="c_syntax_error">Erro</string>
-  <string name="c_result_copied">Resultado foi copiado para a área de transferência!</string>
-  <string name="c_settings">Configurações</string>
-  <string name="c_help">Ajuda</string>
-  <string name="c_vars_and_constants">Variáveis e constantes</string>
-  <string name="c_prefs_main_category">Configurações principais</string>
-  <string name="c_prefs_calculations_category">Configurações de cálculo</string>
-  <string name="c_prefs_appearance_category">Configurações de aparência</string>
-  <string name="c_prefs_other_category">Outras configurações</string>
-  <string name="c_prefs_drag_button_category">Configurações do botão arrastar</string>
-  <string name="c_down">Para baixo</string>
-  <string name="c_up">Acima</string>
-  <string name="c_restart">Reiniciar</string>
-  <string name="c_undo">desfazer</string>
-  <string name="c_redo">refazer</string>
-  <string name="c_clear">C</string>
-  <string name="c_paste">colar</string>
-  <string name="c_vars">vars</string>
-  <string name="c_copy">Copiar</string>
-  <string name="c_plot">Desenhar o gráfico</string>
-  <string name="c_graph">Gráfico</string>
-  <string name="c_calc_color_display_title">Realcar expressões</string>
-  <string name="c_calc_round_result_title">Resultado arredondado</string>
-  <string name="c_calc_round_result_summary">Alterna arredondamento do resultado</string>
-  <string name="c_calc_science_notation_title">Notação científica sempre</string>
-  <string name="c_calc_science_notation_summary">Se ligado, usa somente a notação científica para apresentar o resultado (12.34E-12)</string>
-  <string name="p_calc_result_precision_title">Precisão do resultado</string>
-  <string name="p_calc_max_calculation_time_title">Tempo máximo de cálculo</string>
-  <string name="p_calc_max_calculation_time_summary">Se os cálculos excederem o limite especificado - calculadora interrompe com erro</string>
-  <string name="c_exit">Sair</string>
-  <string name="c_add">Adicionar</string>
-  <string name="c_cancel">Cancelar</string>
-  <string name="c_save">Salvar</string>
-  <string name="c_remove">Remover</string>
-  <string name="c_yes">Sim</string>
-  <string name="c_no">Não</string>
-  <string name="removal_confirmation">Confirmação de remoção</string>
-  <string name="c_var_removal_confirmation_question">Você quer realmente excluir a variável \'%s\'?</string>
-  <string name="c_var_name">Nome</string>
-  <string name="c_var_value">Valor</string>
-  <string name="c_var_description">Descrição</string>
-  <string name="c_var_create_var">Criar a variável</string>
-  <string name="c_var_edit_var">Editar variável</string>
-  <string name="c_value_is_not_a_number">O valor à esquerda deve ser um número ou ficar vazio: se você tiver parâmetros - crie uma função em vez disso!</string>
-  <string name="c_var_name_clashes">Conflito: existe uma função com mesmo nome da variável!</string>
-  <string name="c_var_already_exists">Já existe uma variável com mesmo nome!</string>
-  <string name="c_name_is_not_valid">O nome da constante não é válido: o nome deve iniciar com uma letra, pode conter letras, dígitos e sublinhado.  </string>
-  <string name="c_sys_var_cannot_be_changed">Uma variável de sistema não pode ser alterada!</string>
-  <string name="c_calc_editor_hint">Insira nova expressão</string>
-  <string name="c_press_to_copy">Pressione para copiar</string>
-  <string name="c_continue">Continuar</string>
-  <string name="c_history">Histórico</string>
-  <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Histórico vazio!</string>
-  <string name="c_app_history">Histórico</string>
-  <string name="c_char_is_not_accepted">Caractere \'%s\' não é aceito em nome de variável!</string>
-  <string name="c_calc_angle_units">Unidade atual de ângulo</string>
-  <string name="p_deg">Graus</string>
-  <string name="p_rad">Radianos</string>
-  <string name="p_grad">Grados</string>
-  <string name="p_turns">Transforma</string>
-  <string name="c_angle_units_summary">Define as unidades de ângulos para ser usado em cálculos</string>
-  <string name="c_calc_numeral_bases">Sistema numeral atual</string>
-  <string name="c_numeral_bases_summary">Define o sistema de numeração a ser usado nos cálculos</string>
-  <string name="p_dec">Decimal</string>
-  <string name="p_hex">Hexadecimal</string>
-  <string name="p_oct">Octal</string>
-  <string name="p_bin">Binário</string>
-  <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Cinza</string>
-  <string name="p_violet_theme">Violeta</string>
-  <string name="p_light_blue_theme">Azul Claro</string>
-  <string name="p_metro_blue_theme">Metro Blue</string>
-  <string name="p_metro_green_theme">Metro Green</string>
-  <string name="p_metro_purple_theme">Metro Purple (Roxo)</string>
-  <string name="c_calc_result_precision_summary">Precisão do resultado (todos os cálculos são feitos com precisão máxima, independentemente do valor desta opção)</string>
-  <string name="c_calc_color_display_summary">Alterna a coloração e estilo no editor de calculadora</string>
-  <string name="c_calc_theme_summary">Define o tema para a calculadora</string>
-  <string name="c_clear_history">Limpar Histórico</string>
-  <string name="c_toggle_datetime">Mostrar/Ocultar data</string>
-  <string name="c_simplify_instead_of_numeric">Próximas constantes são indefinidas: {0}!</string>
-  <string name="p_grouping_separator_no">Sem separador de agrupamento</string>
-  <string name="p_grouping_separator_apostrophe">Apóstrofo (\')</string>
-  <string name="p_grouping_separator_space">Espaço ( )</string>
-  <string name="c_calc_grouping_separator">Separador de agrupamento</string>
-  <string name="c_calc_grouping_separator_summary">Separador de agrupamento de conjuntos</string>
-  <string name="c_calc_multiplication_sign">Sinal de multiplicação</string>
-  <string name="c_calc_multiplication_sign_summary">Define o sinal de multiplicação</string>
-  <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_cellphone">Científico (celular)</string>
-  <string name="p_layout_calculator">Científica</string>
-  <string name="p_layout_calculator_mobile">Científica (botões grandes)</string>
-  <string name="p_layout_simple">Simples</string>
-  <string name="p_layout_simple_mobile">Simples (botões grandes)</string>
-  <string name="c_calc_layout_summary">Define o layout dos botões</string>
-  <string name="c_calc_haptic_feedback_title">Feedback tátil</string>
-  <string name="c_calc_haptic_feedback_summary">Ativa e desativa vibração no botão quando clicar</string>
-  <string name="p_calc_haptic_feedback_strength_short">Curto</string>
-  <string name="p_calc_haptic_feedback_strength_middle">Médio</string>
-  <string name="p_calc_haptic_feedback_strength_long">Longo</string>
-  <string name="p_calc_haptic_feedback_duration_title">Duração de feedback tátil</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Duração da vibração durante o clique no botão</string>
-  <string name="empty_var_error">Não é possível criar uma constante vazia!</string>
-  <string name="not_valid_result">O resultado atual não é válido!</string>
-  <string name="c_plot_graph">Gráfico</string>
-  <string name="c_min_x_value">De</string>
-  <string name="c_max_x_value">Para</string>
-  <string name="c_swipe_distance">Distância de \'Swipe\' entre os botões</string>
-  <string name="c_swipe_distance_summary">Configura a distância de \'swipe\' para os botões que suportam ações adicionais de \'swipe\'</string>
-  <string name="c_comment">Comentar</string>
-  <string name="c_history_item_saved">Salvo</string>
-  <string name="c_history_item_not_saved">Não salvo</string>
-  <string name="c_expression_copied">Expressão copiada para a área de transferência!</string>
-  <string name="c_history_item_status">Status:</string>
-  <string name="c_history_item_comment">Comentar:</string>
-  <string name="c_use">Uso</string>
-  <string name="c_use_short">Uso</string>
-  <string name="c_copy_expression">Copiar expressão</string>
-  <string name="c_copy_result">Copiar resultado</string>
-  <string name="c_history_expression">Valor</string>
-  <string name="c_history_item_already_saved">Salvo (veja a aba \'histórico\')</string>
-  <string name="c_history_comment">Comentar</string>
-  <string name="c_save_history">Salvar histórico</string>
-  <string name="c_edit_history">Modificar histórico</string>
-  <string name="c_edit">Modificar</string>
-  <string name="c_saved_history">Salvar no histórico</string>
-  <string name="c_history_already_saved">O histórico já foi salvo!</string>
-  <string name="c_history_must_be_saved">O histórico deve ser salvo antes de ser editado!</string>
-  <string name="c_history_was_removed">O histórico foi removido com sucesso!</string>
-  <string name="c_history_saved">O histórico foi salvo com sucesso!</string>
-  <string name="c_copy_description">Copiar descrição</string>
-  <string name="c_copy_value">Copiar valor</string>
-  <string name="c_first_start_text">Obrigado por escolher o aplicativo Calculadora++! \n\nCalculator++ é uma poderosa ferramenta para fazer os cálculos do dia-a-dia.</string>
-  <string name="c_first_start_text_title">Bem-vindo</string>
-  <string name="c_calc_show_release_notes_title">Mostrar as notas de lançamento</string>
-  <string name="c_calc_show_release_notes_summary">Define se a janela de pop-up \'notas de lançamento\' deve aparecer após as atualizações</string>
-  <string name="c_calc_use_back_button_as_prev_summary">Define o comportamento do botão Voltar</string>
-  <string name="c_calc_use_back_button_as_prev_title">Usar o botão Voltar para ver o histórico anterior</string>
-  <string name="c_clear_billing_info_summary">Informações de compra serão recarregadas do servidor</string>
-  <string name="c_clear_billing_info_title">Atualizar informações de compra</string>
-  <string name="c_warning">Atenção</string>
-  <string name="c_error">Erro</string>
-  <string name="c_billing_error">Faturamento não é suportado: você deve ter uma conta no Google Checkout vinculada à sua conta do Google e deve estar conectado à Internet.  </string>
-  <string name="c_calc_ad_free_title">Apoiar o projeto</string>
-  <string name="c_calc_ad_free_summary">Remover os anúncios</string>
-  <string name="c_calc_already_purchased">A opção de remover os anúncios já foi comprada!</string>
-  <string name="c_calc_purchasing">Comprando...</string>
-  <string name="c_calc_clearing">Limpando...</string>
-  <string name="c_feedback_title">Dê sua opinião</string>
-  <string name="c_feedback_text">Você já usa o Calculator++ há algum tempo \ne é importante para nós saber sua opinião.\n\nPor favor, avalie o Calculator++ \nno <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a> \n e deixe um comentário ou \ncomente sobre \n o aplicativo no <a href="http://facebook.com/calculatorpp"> Facebook</a>  </string>
-  <string name="c_notespp_announce_text">Boas notícias - acabaram de lançar um novo aplicativo para Android chamado <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> Notes ++</a>. \n se você estiver interessado em uma maneira rápida e fácil de fazer notas, por favor vá em <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> link</a> e teste o Notes++!</string>
-  <string name="c_angle_units_changed_to">Unidades de ângulo foram alteradas para \'%s\'!</string>
-  <string name="c_numeral_base_changed_to">A base numérica foi alterada para \'%s\'!</string>
-  <string name="c_conversion_tool">Ferramenta de conversão</string>
-  <string name="c_convert">Converter para...</string>
-  <string name="convert_to_hex">Converter para hexadecimal</string>
-  <string name="convert_to_bin">Converter para binário</string>
-  <string name="convert_to_dec">Converter para decimal</string>
-  <string name="editor">Editor</string>
-  <string name="result">Resultado</string>
-  <string name="other">Outros</string>
-  <string name="derivatives">Derivadas/Integrais</string>
-  <string name="crashed">Calculator++ travou...</string>
-  <string name="crash_dialog_title">Relatório de erros de Calculator++</string>
-  <string name="crash_dialog_text">Infelizmente, Calculator++ travou.\n\n Para corrigir o problema precisamos de algumas informações sobre ele. É altamente recomendado enviar um relatório de erros via e-mail (após pressionar o botão \'Ok\' você verá todos os dados enviados em uma nova janela).\n\n Você quer enviar um relatório de erros?</string>
-  <string name="prefs_graph_screen_title">Configurações de gráfico</string>
-  <string name="prefs_graph_interpolate_function">Interpolar o gráfico da função</string>
-  <string name="prefs_graph_interpolate_function_summary">Se selecionado, a interpolação cúbica será usada no desenho do gráfico da função</string>
-  <string name="prefs_graph_real_color_title">Cor da parte real do gráfico de funções</string>
-  <string name="prefs_graph_real_color_summary">Definir a cor da parte real do gráfico de funções</string>
-  <string name="prefs_graph_imag_color_title">Cor da parte imaginária do gráfico de funções</string>
-  <string name="prefs_graph_imag_color_summary">Definir a cor do gráfico de funções parte imaginária</string>
-  <string name="p_white_line_color">Branco</string>
-  <string name="p_grey_line_color">Cinza</string>
-  <string name="p_red_line_color">Vermelho</string>
-  <string name="p_blue_line_color">Azul</string>
-  <string name="p_green_line_color">Verde</string>
-  <string name="c_function_name">Nome</string>
-  <string name="c_function_value">Valor</string>
-  <string name="c_function_description">Descrição</string>
-  <string name="c_function_parameters">Parâmetros</string>
-  <string name="function_create_function">Criar função</string>
-  <string name="function_edit_function">Editar função</string>
-  <string name="function_name_is_not_valid">O nome da função não é válido: o nome deve começar com uma letra, pode conter letras, dígitos e sublinhado.</string>
-  <string name="function_already_exists">Já existe uma função com o mesmo nome!</string>
-  <string name="function_is_empty">O corpo da função não pode ficar vazio!</string>
-  <string name="function_param_not_empty">O parâmetro da função não pode ficar vazio!</string>
-  <string name="function_removal_confirmation_question">Você quer realmente excluir a função \'%s\'?</string>
-  <string name="empty_function_error">Não é possível criar uma função vazia!</string>
-  <string name="do_not_show_messages_in_session">Não mostre esta mensagem até a próxima sessão</string>
-  <string name="calculation_messages_dialog_title">Aviso</string>
-  <string name="arithmetic_error_while_plot">Um erro aritmético ocorreu durante a plotagem: %s</string>
-  <string name="ok">OK</string>
-  <string name="p_show_calculation_messages_dialog_title">Mostrar mensagens de cálculo na caixa de diálogo</string>
-  <string name="p_show_calculation_messages_dialog_summary">Se ativada, qualquer mensagem que ocorrer durante cálculos especiais será exibida numa caixa de diálogo</string>
-  <string name="fix">Consertar</string>
-  <string name="p_preferred_numeral_base_title">Sistema de numeração padrão</string>
-  <string name="p_preferred_numeral_base_summary">Define o sistema de numeração padrão</string>
-  <string name="preferred_numeral_base_message">Sistema de numeração padrão \'%1$s\' difere do atual \'%2$s\'. Você esqueceu de mudar de volta?</string>
-  <string name="p_preferred_angle_units_title">Unidades de ângulo padrão</string>
-  <string name="p_preferred_angle_units_summary">Define as unidades de ângulo padrão</string>
-  <string name="preferred_angle_units_message">Padrão de unidade para ângulos \'%1$s\' difere do atual \'%2$s\'. Você esqueceu de mudar de volta?</string>
-  <string name="close">Fechar</string>
-  <string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
-  <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
-  <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
-  <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
-  <string name="open_onscreen_calculator">Clique para abrir a calculadora no modo de janela</string>
-  <string name="prefs_onscreen_title">Configurações de calculadora (em uma janela separada)</string>
-  <string name="prefs_onscreen_start_on_boot_title">Executar aplicativo na inicialização do sistema</string>
-  <string name="prefs_onscreen_start_on_boot_summary">Se ligado, a calculadora aparecerá na barra de notificação após a inicialização do dispositivo</string>
-  <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
-  <string name="prefs_onscreen_show_app_icon_summary">Se ligado, um segundo ícone será mostrado na lista de aplicações</string>
-  <string name="cpp_onscreen_remove_icon_message">Você pode remover o segundo ícone na lista de aplicativos através das configurações do aplicativo ou pressionando o botão Avançar</string>
-  <string name="cpp_this_change_may_require_reboot">Essa mudança pode exigir reinicialização</string>
-  <string name="cpp_plot_2d">Plotagem 2D</string>
-  <string name="cpp_plot_3d">Plotagem 3D</string>
-  <string name="cpp_plot_functions">Gráfico de funções</string>
-  <string name="cpp_prefs_graph_plot_imag_title">Plotar a parte imaginária da função</string>
-  <string name="cpp_prefs_graph_plot_imag_summary">Se selecionado, a parte imaginária da função será plotada</string>
-  <string name="cpp_monochrome_line_color_type">Monocromático</string>
-  <string name="cpp_color_map_line_color_type">Mapa de cor (3D apenas)</string>
-  <string name="cpp_solid_line_style">Sólido (-----)</string>
-  <string name="cpp_dashed_line_style">Tracejada (- - -)</string>
-  <string name="cpp_dotted_line_style">Pontilhado (. . .)</string>
-  <string name="cpp_dash_dotted_line_style">Ponto e Traço (-.-.-)</string>
-  <string name="cpp_plotter">Plotadora de função</string>
-  <string name="cpp_plot_screenshot">Capturar screenshot</string>
-  <string name="cpp_plot_screenshot_saved">Screenshot foi guardado com sucesso: %1$s!</string>
-  <string name="cpp_plot_unable_to_save_screenshot">Captura de tela não pode ser salva porque o cartão SD não está inserido ou montado. Insira ou monte o cartão SD e tente novamente!</string>
-  <string name="cpp_plot_function_line_color_type">Tipo de cor de linha</string>
-  <string name="cpp_plot_function_line_color">Cor da linha</string>
-  <string name="cpp_plot_function_line_style">Estilo de linha</string>
-  <string name="cpp_plot_function_line_width">Largura da linha</string>
-  <string name="cpp_plot_function_settings">Configurações de função</string>
-  <string name="cpp_function">Função</string>
-  <string name="cpp_pinned">Fixo</string>
-  <string name="cpp_visible">Visível</string>
-  <string name="cpp_plot_button_text">+plot</string>
-  <string name="cpp_plot_empty_function_error">Não é possível plotar uma função vazia!</string>
-  <string name="cpp_plot_too_many_variables">Não é possível plotar: muitas variáveis!</string>
-  <string name="cpp_plot_range">Escala do gráfico</string>
-  <string name="cpp_fullscreen">Tela cheia</string>
-  <string name="cpp_plot_range_x_min">X Min</string>
-  <string name="cpp_plot_range_x_max">X Max</string>
-  <string name="cpp_plot_range_y_min">Y Min</string>
-  <string name="cpp_plot_range_y_max">Max Y</string>
-  <string name="cpp_invalid_number">Número inválido!</string>
-  <string name="cpp_plot_boundaries_should_differ">Os limites do gráfico não devem ser o mesmo!</string>
-  <string name="cpp_apply">Aplicar</string>
-  <string name="cpp_message">Mensagem</string>
-  <string name="cpp_continue">Continuar</string>
-  <string name="cpp_purchase_text">Apoiar o projeto é fácil e seguro: o processo de compra é fornecido pelo Google e tudo que você precisa é ums conta do Google corretamente configurada.\n\n As informações sobre pagamento são armazenadas nos servidores do Google com sua conta do Google e você pode facilmente usar esta aplicação em vários dispositivos.\n\n, Clicando o botão \'Continuar\', você será redirecionado para o aplicativo Google para fazer o pagamento.</string>
-  <string name="cpp_purchase_title">Comprar</string>
-  <string name="cpp_purchase_thank_you_text">Obrigado por ajudar esta aplicação! \n\n Pode demorar vários minutos até que o app será informado sobre a compra. Você pode sempre verificar as informações sobre a compra em sua conta do Google. \n Se você tiver qualquer problema ou dúvida não hesite em entrar em contato comigo diretamente (os meus contatos estão disponíveis no Menu-&gt;Principal--&gt;Sobre)  </string>
-  <string name="cpp_var_show_greek_keyboard">Mostrar letras gregas</string>
-  <string name="cpp_var_hide_greek_keyboard">Mostrar letras gregas</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_vars.xml b/android-app/src/main/res/values-pt-rbr/text_vars.xml
deleted file mode 100644
index 83037f96..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_vars.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_var_description_PI">Relação da circunferência de qualquer círculo com seu diâmetro. Nota: esta constante é a unidade de grau dependente = &gt; rad: 3.14, deg: 180.0</string>
-  <string name="c_var_description_pi">Relação da circunferência de qualquer círculo com seu diâmetro. Nota: esta constante é a unidade de grau independente = &gt; rad: 3.14, deg: 180.0</string>
-  <string name="c_var_description_e">Único número real tal que o valor da derivada (inclinação da linha tangente) da função f(x) = e^x no ponto x = 0 é igual a 1</string>
-  <string name="c_var_description_i">Unidade imaginária, definida como i^2 = − 1</string>
-  <string name="c_var_description_c">Velocidade da luz no vácuo, m·s</string>
-  <string name="c_var_description_G">A constante gravitacional é uma constante física empírica envolvida no cálculo da atração gravitacional entre objetos com massa, m^ 3·kg^−1·s^−2 </string>
-  <string name="c_var_description_h">Constante física que reflete a quantidade de energia de uma quantum na mecânica quântica, J·s</string>
-  <string name="c_var_description_h_reduced">Constante de Planck reduzida, J·s</string>
-  <string name="c_var_description_nan">Não é um número</string>
-  <string name="c_var_description_inf">Infinito</string>
-  <string name="c_var_system">Built-in</string>
-  <string name="c_var_my">Minhas variáveis</string>
-</resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_wizard.xml b/android-app/src/main/res/values-pt-rbr/text_wizard.xml
deleted file mode 100644
index d6213974..00000000
--- a/android-app/src/main/res/values-pt-rbr/text_wizard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="cpp_wizard_next">Avançar</string>
-  <string name="cpp_wizard_back">Voltar</string>
-  <string name="cpp_wizard_finish">Terminar</string>
-  <string name="cpp_wizard_start">Iniciar assistente de configuração</string>
-  <string name="cpp_wizard_layout_optimized">Otimizado</string>
-  <string name="cpp_wizard_layout_big_buttons">Botões grandes</string>
-  <string name="cpp_wizard_mode_simple">Simples</string>
-  <string name="cpp_wizard_mode_simple_description">No modo simples, apenas as funcionalidades básicas estarão disponíveis na tela principal. Os resultados serão arredondados para 5 dígitos e os ângulos serão medidos em grau.</string>
-  <string name="cpp_wizard_mode_engineer">Engenheiro</string>
-  <string name="cpp_wizard_mode_engineer_description">No modo Engenheiro as funções especiais serão exibidas na tela principal. Os resultados não serão arredondados e serão apresentados em notação de engenharia. Além disso, a unidade de ângulo padrão será o radiano.</string>
-  <string name="cpp_restart_wizard">Iniciar assistente de configuração</string>
-  <string name="cpp_wizard_dragbutton_action_end">Excelente! Toque no botão mais uma vez para tentar novamente</string>
-  <string name="cpp_wizard_dragbutton_action_center">Toque no botão abaixo uma vez para usar o 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Arraste do centro do botão para cima para usar o %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Arraste do centro do botão para a esquerda para usar o seno</string>
-  <string name="cpp_wizard_dragbutton_action_down">Arraste do centro do botão para baixo para usar o ^2</string>
-  <string name="cpp_wizard_welcome_title">Bem-vindo</string>
-  <string name="cpp_wizard_layout_title">Escolha o layout</string>
-  <string name="cpp_wizard_mode_title">Escolha o modo</string>
-  <string name="cpp_wizard_onscreen_calculator_title">Calculadora em uma janela separada</string>
-  <string name="cpp_wizard_dragbutton_title">O básico do Drag Button</string>
-  <string name="cpp_wizard_final_title">Quase pronto!</string>
-  <string name="cpp_wizard_final_free_and_opensource">Calculator++ é um programa gratuito e open-source: todos os recursos são gratuitos e o código-fonte pode ser encontrado em https://github.com/ </string>
-  <string name="cpp_wizard_final_ways_to_help">Existem várias maneiras de você ajudar a melhorar este app: </string>
-  <string name="cpp_wizard_final_donate">Doando dinheiro</string>
-  <string name="cpp_wizard_final_translate">Traduzindo</string>
-  <string name="cpp_wizard_final_contribute">Contribuindo com código-fonte</string>
-  <string name="cpp_wizard_onscreen_description">A calculadora em janela separada permite que você faça cálculos enquanto estiver usando outros aplicativos no seu dispositivo</string>
-  <string name="cpp_wizard_onscreen_checkbox">Habilitar a calculadora em janela separada (um segundo ícone aparecerá na lista de aplicativos)</string>
-  <string name="cpp_wizard_dragbutton_description">Drag button é uma funcionalidade exclusiva de Calculator++ que fornece acesso rápido às funções secundárias</string>
-  <string name="cpp_wizard_finish_confirmation">Parar a configuração da aplicação?</string>
-</resources>
diff --git a/android-app/src/main/res/values-ru/strings.xml b/android-app/src/main/res/values-ru/strings.xml
deleted file mode 100644
index bc88d3c4..00000000
--- a/android-app/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Вы действительно хотите завершить визард?</string>
-	<string name="acl_wizard_next">Далее</string>
-	<string name="acl_wizard_back">Назад</string>
-	<string name="acl_wizard_finish">Готово</string>
-	<string name="acl_wizard_start">Начать визард</string>
-	<string name="cpp_clear_history">Отчистить</string>
-	<string name="cpp_clear_history_message">Вся история будет отчищена</string>
-	<string name="cpp_clear_history_title">Отчистить историю?</string>
-	<string name="wizard_start">Начать визард</string>
-	<string name="wizard_skip">Пропустить</string>
-	<string name="wizard_finish">Готово</string>
-	<string name="wizard_next">Далее</string>
-	<string name="wizard_prev">Назад</string>
-	<string name="wizard_final">Приложение настроено и готово к использованию.</string>
-	<string name="wizard_finish_confirmation_title">Закончить?</string>
-	<string name="cpp_new_in_version">Новое в версии %1$s</string>
-	<string name="release_notes_choose_theme">Хотите попробовать новые темы в стиле Material? Выберите их из списка:</string>
-	<string name="cpp_wizard_theme_title">Выберите тему</string>
-
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values-ru/text_strings.xml b/android-app/src/main/res/values-ru/text_strings.xml
index 4972c9b8..73a09fe3 100644
--- a/android-app/src/main/res/values-ru/text_strings.xml
+++ b/android-app/src/main/res/values-ru/text_strings.xml
@@ -328,4 +328,6 @@
 	</string>
   <string name="cpp_var_show_greek_keyboard">Показать греческий алфавит</string>
   <string name="cpp_var_hide_greek_keyboard">Скрыть греческий алфавит</string>
+	<string name="cpp_new_in_version">Новое в версии %1$s</string>
+	<string name="cpp_release_notes_choose_theme">Хотите попробовать новые темы в стиле Material? Выберите их из списка:</string>
 </resources>
diff --git a/android-app/src/main/res/values-ru/text_wizard.xml b/android-app/src/main/res/values-ru/text_wizard.xml
index 85e5ed88..1f2000dd 100644
--- a/android-app/src/main/res/values-ru/text_wizard.xml
+++ b/android-app/src/main/res/values-ru/text_wizard.xml
@@ -4,7 +4,6 @@
 <resources>
   <string name="cpp_wizard_next">Далее</string>
   <string name="cpp_wizard_back">Назад</string>
-  <string name="cpp_wizard_finish">Завершить</string>
   <string name="cpp_wizard_start">Начать визард</string>
   <string name="cpp_wizard_layout_optimized">Оптимизированная</string>
   <string name="cpp_wizard_layout_big_buttons">С большими кнопками</string>
@@ -35,4 +34,11 @@
   <string name="cpp_wizard_dragbutton_description">Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора
 	</string>
   <string name="cpp_wizard_finish_confirmation">Вы действительно хотите завершить визард?</string>
+	<string name="cpp_wizard_theme_title">Выберите тему</string>
+	<string name="cpp_wizard_finish">Готово</string>
+	<string name="cpp_clear_history">Отчистить</string>
+	<string name="cpp_clear_history_message">Вся история будет отчищена</string>
+	<string name="cpp_clear_history_title">Отчистить историю?</string>
+	<string name="cpp_wizard_skip">Пропустить</string>
+	<string name="cpp_wizard_finish_confirmation_title">Закончить?</string>
 </resources>
diff --git a/android-app/src/main/res/values-uk/strings.xml b/android-app/src/main/res/values-uk/strings.xml
deleted file mode 100644
index bc89f9c1..00000000
--- a/android-app/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="acl_wizard_finish_confirmation">Ви дійсно бажаєте вийти з майстра?</string>
-	<string name="acl_wizard_next">Далі</string>
-	<string name="acl_wizard_back">Назад</string>
-	<string name="acl_wizard_finish">Завершити</string>
-	<string name="acl_wizard_start">Запустити майстер</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/strings.xml b/android-app/src/main/res/values/strings.xml
deleted file mode 100644
index 7ecd2bcb..00000000
--- a/android-app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="wizard_finish_confirmation_title">Finish?</string>
-	<string name="acl_wizard_next">Next</string>
-	<string name="acl_wizard_back">Back</string>
-	<string name="acl_wizard_finish">Done</string>
-	<string name="acl_wizard_start">Start wizard</string>
-	<string name="cpp_clear_history_title">Clear history?</string>
-	<string name="cpp_clear_history_message">All history will be cleared.</string>
-	<string name="cpp_clear_history">Clear</string>
-	<string name="wizard_skip">Skip</string>
-	<string name="cpp_new_in_version">New in %1$s version</string>
-	<string name="release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
-</resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/text_strings.xml b/android-app/src/main/res/values/text_strings.xml
index b7bd761b..74167da8 100644
--- a/android-app/src/main/res/values/text_strings.xml
+++ b/android-app/src/main/res/values/text_strings.xml
@@ -323,4 +323,9 @@
 	</string>
   <string name="cpp_var_show_greek_keyboard">Show Greek letters</string>
   <string name="cpp_var_hide_greek_keyboard">Hide Greek letters</string>
+	<string name="cpp_clear_history_title">Clear history?</string>
+	<string name="cpp_clear_history_message">All history will be cleared.</string>
+	<string name="cpp_clear_history">Clear</string>
+	<string name="cpp_new_in_version">New in %1$s version</string>
+	<string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values/text_wizard.xml b/android-app/src/main/res/values/text_wizard.xml
index f76f2661..82d2b94e 100644
--- a/android-app/src/main/res/values/text_wizard.xml
+++ b/android-app/src/main/res/values/text_wizard.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
+<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-  <string name="cpp_wizard_next">Next</string>
-  <string name="cpp_wizard_back">Back</string>
-  <string name="cpp_wizard_finish">Finish</string>
-  <string name="cpp_wizard_start">Start wizard</string>
-  <string name="cpp_wizard_layout_optimized">Optimized</string>
-  <string name="cpp_wizard_layout_big_buttons">Big buttons</string>
-  <string name="cpp_wizard_mode_simple">Simple</string>
+	<string name="cpp_wizard_next">Next</string>
+	<string name="cpp_wizard_back">Back</string>
+	<string name="cpp_wizard_start">Start wizard</string>
+	<string name="cpp_wizard_finish">Done</string>
+	<string name="cpp_wizard_layout_optimized">Optimized</string>
+	<string name="cpp_wizard_layout_big_buttons">Big buttons</string>
+	<string name="cpp_wizard_mode_simple">Simple</string>
   <string name="cpp_wizard_mode_simple_description">In simple mode only basic functionality will be available from the
 		main screen.
 		Result is rounded up to 5 digits, degrees are used as the default angle units.
 	</string>
-  <string name="cpp_wizard_mode_engineer">Engineer</string>
+	<string name="cpp_wizard_mode_engineer">Engineer</string>
   <string name="cpp_wizard_mode_engineer_description">In engineer mode special functions will be used on the main
 		screen.
 		Result is not rounded and is presented in engineer notation, radians are used as the default angle units.
 	</string>
-  <string name="cpp_restart_wizard">Start wizard</string>
-  <string name="cpp_wizard_dragbutton_action_end">Excellent! Tap the button one more time to try again</string>
-  <string name="cpp_wizard_dragbutton_action_center">Tap the button below once to use 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Swipe from the center of the button up to use %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Swipe from the center of the button to the left to use sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Swipe from the center of the button down to use ^2</string>
-  <string name="cpp_wizard_welcome_title">Welcome</string>
-  <string name="cpp_wizard_layout_title">Choose layout</string>
-  <string name="cpp_wizard_mode_title">Choose mode</string>
-  <string name="cpp_wizard_theme_title">Choose theme</string>
-  <string name="cpp_wizard_onscreen_calculator_title">Calculator in a separate window</string>
-  <string name="cpp_wizard_dragbutton_title">Swipe button basics</string>
-  <string name="cpp_wizard_final_done">The app is set up and ready to use.</string>
-  <string name="cpp_wizard_final_title">Almost done!</string>
+	<string name="cpp_restart_wizard">Start wizard</string>
+	<string name="cpp_wizard_dragbutton_action_end">Excellent! Tap the button one more time to try again</string>
+	<string name="cpp_wizard_dragbutton_action_center">Tap the button below once to use 9</string>
+	<string name="cpp_wizard_dragbutton_action_up">Swipe from the center of the button up to use %</string>
+	<string name="cpp_wizard_dragbutton_action_left">Swipe from the center of the button to the left to use sin</string>
+	<string name="cpp_wizard_dragbutton_action_down">Swipe from the center of the button down to use ^2</string>
+	<string name="cpp_wizard_welcome_title">Welcome</string>
+	<string name="cpp_wizard_layout_title">Choose layout</string>
+	<string name="cpp_wizard_mode_title">Choose mode</string>
+	<string name="cpp_wizard_theme_title">Choose theme</string>
+	<string name="cpp_wizard_onscreen_calculator_title">Calculator in a separate window</string>
+	<string name="cpp_wizard_dragbutton_title">Swipe button basics</string>
+	<string name="cpp_wizard_final_done">The app is set up and ready to use.</string>
+	<string name="cpp_wizard_final_title">Almost done!</string>
   <string name="cpp_wizard_final_free_and_opensource">Calculator++ is free and open-source: all the features are free
 		of charge and source code can be found on github.
 	</string>
   <string name="cpp_wizard_final_ways_to_help">There are several ways how you can help to make this app better:
 	</string>
-  <string name="cpp_wizard_final_donate">Donating money</string>
-  <string name="cpp_wizard_final_translate">Translating</string>
-  <string name="cpp_wizard_final_contribute">Contributing source code</string>
+	<string name="cpp_wizard_final_donate">Donating money</string>
+	<string name="cpp_wizard_final_translate">Translating</string>
+	<string name="cpp_wizard_final_contribute">Contributing source code</string>
   <string name="cpp_wizard_onscreen_description">Calculator in separate window allows you to do calculations while
 		using other apps on your device
 	</string>
-  <string name="cpp_wizard_onscreen_checkbox">Enable</string>
+	<string name="cpp_wizard_onscreen_checkbox">Enable</string>
   <string name="cpp_wizard_dragbutton_description">Swipe button is an exclusive feature of Calculator++ which provides
 		fast access to the secondary functions
 	</string>
-  <string name="cpp_wizard_finish_confirmation">Do you really want to finish wizard?</string>
+	<string name="cpp_wizard_finish_confirmation">Do you really want to finish wizard?</string>
+	<string name="cpp_wizard_skip">Skip</string>
+	<string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>