Merge branch 'master' of https://github.com/serso/android-calculatorpp

2015-02-23 10:34:32 +01:00 · 2015-02-23 10:34:32 +01:00 · 68c6d38e1e
commit 68c6d38e1e
parent 75a8231afc e3aab3d2d3
98 changed files with 480 additions and 897 deletions
--- a/android-app/android-app.iml
+++ b/android-app/android-app.iml
@ -96,7 +96,7 @@
    <orderEntry type="library" exported="" name="common-text-1.0.7" level="project" />
    <orderEntry type="library" exported="" name="android-common-views-1.1.18" level="project" />
    <orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="jscl-1.0.9" level="project" />
+    <orderEntry type="library" exported="" name="jscl-1.0.11" level="project" />
    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
    <orderEntry type="library" exported="" name="material-0.1.2" level="project" />
    <orderEntry type="library" exported="" name="android-common-menus-1.1.18" level="project" />
--- a/android-app/src/main/AndroidManifest.xml
+++ b/android-app/src/main/AndroidManifest.xml
@ -112,6 +112,19 @@

 		<!-- WIDGET CONFIG -->

+		<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_name" android:name=".widget.CalculatorWidget">
+
+			<intent-filter>
+				<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+				<action android:name="org.solovyev.android.calculator.INIT"/>
+				<action android:name="org.solovyev.android.calculator.EDITOR_STATE_CHANGED"/>
+				<action android:name="org.solovyev.android.calculator.DISPLAY_STATE_CHANGED"/>
+				<action android:name="org.solovyev.android.calculator.BUTTON_PRESSED"/>
+			</intent-filter>
+
+			<meta-data android:name="android.appwidget.provider" android:resource="@xml/calculator_widget"/>
+		</receiver>
+
 		<receiver android:icon="@drawable/ic_launcher" android:label="@string/c_app_widget_3x3_name" android:name=".widget.CalculatorWidgetProvider">

 			<intent-filter>
--- a/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/ActivityUi.java
@ -112,7 +112,7 @@ public class ActivityUi extends BaseUi {
 		toggleTitle(activity, actionBar, true);

 		if (!homeAsUp) {
-			actionBar.setIcon(R.drawable.ab_icon);
+			actionBar.setIcon(R.drawable.ab_logo);
 		}
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 	}
--- a/android-app/src/main/java/org/solovyev/android/calculator/App.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/App.java
@ -23,20 +23,31 @@
 package org.solovyev.android.calculator;

 import android.app.Application;
-import android.content.Context;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.util.Log;

+import org.solovyev.android.Android;
 import org.solovyev.android.UiThreadExecutor;
 import org.solovyev.android.Views;
 import org.solovyev.android.calculator.ga.Ga;
 import org.solovyev.android.calculator.view.ScreenMetrics;
+import org.solovyev.android.calculator.widget.BaseCalculatorWidgetProvider;
+import org.solovyev.android.calculator.widget.CalculatorWidgetProvider;
+import org.solovyev.android.calculator.widget.CalculatorWidgetProvider3x4;
+import org.solovyev.android.calculator.widget.CalculatorWidgetProvider4x4;
+import org.solovyev.android.calculator.widget.CalculatorWidgetProvider4x5;
 import org.solovyev.android.checkout.*;
-import org.solovyev.android.view.VibratorContainer;
 import org.solovyev.common.listeners.JEvent;
 import org.solovyev.common.listeners.JEventListener;
 import org.solovyev.common.listeners.JEventListeners;
@ -46,7 +57,9 @@ import org.solovyev.common.threads.DelayedExecutor;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.Executor;

 /**
@ -62,14 +75,8 @@ import java.util.concurrent.Executor;
 * Before first usage this class must be initialized by calling {@link App#init(android.app.Application)} method (for example, from {@link android.app.Application#onCreate()})
 */
 public final class App {
-
-    /*
-	**********************************************************************
-    *
-    *                           FIELDS
-    *
-    **********************************************************************
-    */
+	@Nonnull
+	private static final List<Class<? extends BaseCalculatorWidgetProvider>> OLD_WIDGETS = Arrays.asList(CalculatorWidgetProvider.class, CalculatorWidgetProvider3x4.class, CalculatorWidgetProvider4x4.class, CalculatorWidgetProvider4x5.class);

 	@Nonnull
 	private static volatile Application application;
@ -166,12 +173,43 @@ public final class App {
 			App.broadcaster = new CalculatorBroadcaster(application);
 			App.vibrator = new Vibrator(application, preferences);
 			App.screenMetrics = new ScreenMetrics(application);
+
+			final List<Class<? extends AppWidgetProvider>> oldNotUsedWidgetClasses = findNotUsedWidgets(application);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+				for (Class<? extends AppWidgetProvider> oldNotUsedWidgetClass : oldNotUsedWidgetClasses) {
+					Android.enableComponent(application, oldNotUsedWidgetClass, false);
+				}
+			} else {
+				// smaller widgets should be still used for smaller screens
+				if (oldNotUsedWidgetClasses.contains(CalculatorWidgetProvider4x5.class)) {
+					Android.enableComponent(application, CalculatorWidgetProvider4x5.class, false);
+				}
+				if (oldNotUsedWidgetClasses.contains(CalculatorWidgetProvider4x4.class)) {
+					Android.enableComponent(application, CalculatorWidgetProvider4x4.class, false);
+				}
+			}
+
 			App.initialized = true;
 		} else {
 			throw new IllegalStateException("Already initialized!");
 		}
 	}

+	@Nonnull
+	private static List<Class<? extends AppWidgetProvider>> findNotUsedWidgets(@Nonnull Application application) {
+		final List<Class<? extends AppWidgetProvider>> result = new ArrayList<>();
+
+		final AppWidgetManager widgetManager = AppWidgetManager.getInstance(application);
+		for (Class<? extends AppWidgetProvider> widgetClass : OLD_WIDGETS) {
+			final int ids[] = widgetManager.getAppWidgetIds(new ComponentName(application, widgetClass));
+			if (ids == null || ids.length == 0) {
+				result.add(widgetClass);
+			}
+		}
+
+		return result;
+	}
+
 	private static void checkInit() {
 		if (!initialized) {
 			throw new IllegalStateException("App should be initialized!");
@ -271,4 +309,18 @@ public final class App {
 	public static ScreenMetrics getScreenMetrics() {
 		return screenMetrics;
 	}
+
+	public static void showDialog(@Nonnull DialogFragment dialogFragment,
+								  @Nonnull String fragmentTag,
+								  @Nonnull FragmentManager fm) {
+		final FragmentTransaction ft = fm.beginTransaction();
+
+		Fragment prev = fm.findFragmentByTag(fragmentTag);
+		if (prev != null) {
+			ft.remove(prev);
+		}
+
+		// Create and show the dialog.
+		dialogFragment.show(ft, fragmentTag);
+	}
 }
--- a/android-app/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/external/ExternalCalculatorIntentHandler.java
@ -1,38 +0,0 @@
-/*
- * Copyright 2013 serso aka se.solovyev
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Contact details
- *
- * Email: se.solovyev@gmail.com
- * Site:  http://se.solovyev.org
- */
-
-package org.solovyev.android.calculator.external;
-
-import android.content.Context;
-import android.content.Intent;
-
-import javax.annotation.Nonnull;
-
-/**
- * User: serso
- * Date: 11/20/12
- * Time: 10:33 PM
- */
-public interface ExternalCalculatorIntentHandler {
-
-	void onIntent(@Nonnull Context context, @Nonnull Intent intent);
-}
--- a/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/function/FunctionEditDialogFragment.java
@ -44,7 +44,6 @@ import org.solovyev.android.calculator.math.edit.CalculatorFunctionsActivity;
 import org.solovyev.android.calculator.math.edit.CalculatorFunctionsFragment;
 import org.solovyev.android.calculator.math.edit.MathEntityRemover;
 import org.solovyev.android.calculator.model.AFunction;
-import org.solovyev.android.sherlock.AndroidSherlockUtils;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@ -210,7 +209,7 @@ public class FunctionEditDialogFragment extends DialogFragment implements Calcul
 	}

 	public static void showDialog(@Nonnull Input input, @Nonnull FragmentManager fm) {
-		AndroidSherlockUtils.showDialog(create(input), "function-editor", fm);
+		App.showDialog(create(input), "function-editor", fm);
 	}

 	public static class Input implements Parcelable {
--- a/android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/math/edit/VarEditDialogFragment.java
@ -37,7 +37,6 @@ import jscl.math.function.IConstant;
 import org.solovyev.android.Views;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.model.Var;
-import org.solovyev.android.sherlock.AndroidSherlockUtils;
 import org.solovyev.common.text.Strings;

 import javax.annotation.Nonnull;
@ -257,7 +256,7 @@ public class VarEditDialogFragment extends DialogFragment implements CalculatorE
 	*/

 	public static void showDialog(@Nonnull Input input, @Nonnull FragmentManager fm) {
-		AndroidSherlockUtils.showDialog(create(input), "constant-editor", fm);
+		App.showDialog(create(input), "constant-editor", fm);
 	}

 	public static class Input {
--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/AbstractCalculatorWidgetProvider.java
@ -49,7 +49,7 @@ import static org.solovyev.android.calculator.CalculatorReceiver.newButtonClicke
 * Date: 19.10.12
 * Time: 16:18
 */
-abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
+public abstract class BaseCalculatorWidgetProvider extends AppWidgetProvider {

 	private static final String TAG = "Calculator++ Widget";
 	private static final int WIDGET_CATEGORY_KEYGUARD = 2;
@ -75,7 +75,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
 	**********************************************************************
 	*/

-	protected AbstractCalculatorWidgetProvider() {
+	protected BaseCalculatorWidgetProvider() {
 	}

 	/*
@ -116,7 +116,7 @@ abstract class AbstractCalculatorWidgetProvider extends AppWidgetProvider {
 	}

 	@Nonnull
-	protected Class<? extends AbstractCalculatorWidgetProvider> getComponentClass() {
+	protected Class<? extends BaseCalculatorWidgetProvider> getComponentClass() {
 		return this.getClass();
 	}

--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidget.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidget.java
@ -0,0 +1,4 @@
+package org.solovyev.android.calculator.widget;
+
+public class CalculatorWidget extends BaseCalculatorWidgetProvider {
+}
--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider.java
@ -27,5 +27,5 @@ package org.solovyev.android.calculator.widget;
 * Date: 11/18/12
 * Time: 1:00 PM
 */
-public class CalculatorWidgetProvider extends AbstractCalculatorWidgetProvider {
+public class CalculatorWidgetProvider extends BaseCalculatorWidgetProvider {
 }
--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider3x4.java
@ -27,5 +27,5 @@ package org.solovyev.android.calculator.widget;
 * Date: 11/18/12
 * Time: 1:01 PM
 */
-public class CalculatorWidgetProvider3x4 extends AbstractCalculatorWidgetProvider {
+public class CalculatorWidgetProvider3x4 extends BaseCalculatorWidgetProvider {
 }
--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x4.java
@ -27,5 +27,5 @@ package org.solovyev.android.calculator.widget;
 * Date: 11/18/12
 * Time: 1:01 PM
 */
-public class CalculatorWidgetProvider4x4 extends AbstractCalculatorWidgetProvider {
+public class CalculatorWidgetProvider4x4 extends BaseCalculatorWidgetProvider {
 }
--- a/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
+++ b/android-app/src/main/java/org/solovyev/android/calculator/widget/CalculatorWidgetProvider4x5.java
@ -27,5 +27,5 @@ package org.solovyev.android.calculator.widget;
 * Date: 11/18/12
 * Time: 7:43 PM
 */
-public class CalculatorWidgetProvider4x5 extends AbstractCalculatorWidgetProvider {
+public class CalculatorWidgetProvider4x5 extends BaseCalculatorWidgetProvider {
 }
--- a/android-app/src/main/java/org/solovyev/android/sherlock/AndroidSherlockUtils.java
+++ b/android-app/src/main/java/org/solovyev/android/sherlock/AndroidSherlockUtils.java
@ -1,63 +0,0 @@
-/*
- * Copyright 2013 serso aka se.solovyev
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * Contact details
- *
- * Email: se.solovyev@gmail.com
- * Site:  http://se.solovyev.org
- */
-
-package org.solovyev.android.sherlock;
-
-import android.app.Activity;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.MenuInflater;
-
-import javax.annotation.Nonnull;
-
-/**
- * User: serso
- * Date: 8/13/12
- * Time: 2:04 AM
- */
-public final class AndroidSherlockUtils {
-
-	private AndroidSherlockUtils() {
-		throw new AssertionError("Not intended for instantiation!");
-	}
-
-	@Nonnull
-	public static MenuInflater getSupportMenuInflater(@Nonnull Activity activity) {
-		return activity.getMenuInflater();
-	}
-
-	public static void showDialog(@Nonnull DialogFragment dialogFragment,
-								  @Nonnull String fragmentTag,
-								  @Nonnull FragmentManager fm) {
-		final FragmentTransaction ft = fm.beginTransaction();
-
-		Fragment prev = fm.findFragmentByTag(fragmentTag);
-		if (prev != null) {
-			ft.remove(prev);
-		}
-
-		// Create and show the dialog.
-		dialogFragment.show(ft, fragmentTag);
-	}
-}
--- a/android-app/src/main/java/org/solovyev/android/sherlock/Fragments.java
+++ b/android-app/src/main/java/org/solovyev/android/sherlock/Fragments.java
@ -1,43 +0,0 @@
-package org.solovyev.android.sherlock;
-
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-
-import javax.annotation.Nonnull;
-
-public class Fragments extends org.solovyev.android.Fragments {
-
-	private Fragments() {
-	}
-
-	public static void showDialog(@Nonnull DialogFragment dialogFragment,
-								  @Nonnull String fragmentTag,
-								  @Nonnull FragmentManager fm) {
-		showDialog(dialogFragment, fragmentTag, fm, true);
-	}
-
-	public static void showDialog(DialogFragment dialogFragment, String fragmentTag, FragmentManager fm, boolean useExisting) {
-		Fragment prev = fm.findFragmentByTag(fragmentTag);
-		if (prev != null) {
-			if (!useExisting) {
-				final FragmentTransaction ft = fm.beginTransaction();
-				ft.remove(prev);
-				ft.addToBackStack(null);
-
-				// Create and show the dialog.
-				dialogFragment.show(ft, fragmentTag);
-				fm.executePendingTransactions();
-			}
-		} else {
-			final FragmentTransaction ft = fm.beginTransaction();
-
-			ft.addToBackStack(null);
-
-			// Create and show the dialog.
-			dialogFragment.show(ft, fragmentTag);
-			fm.executePendingTransactions();
-		}
-	}
-}
--- a/android-app/src/main/res/drawable-hdpi/ab_clock.png
+++ b/android-app/src/main/res/drawable-hdpi/ab_clock.png
--- a/android-app/src/main/res/drawable-hdpi/ab_icon.png
+++ b/android-app/src/main/res/drawable-hdpi/ab_icon.png
--- a/android-app/src/main/res/drawable-hdpi/ab_logo.png
+++ b/android-app/src/main/res/drawable-hdpi/ab_logo.png
--- a/android-app/src/main/res/drawable-hdpi/ic_access_time_grey600_48dp.png
+++ b/android-app/src/main/res/drawable-hdpi/ic_access_time_grey600_48dp.png
--- a/android-app/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/android-app/src/main/res/drawable-hdpi/ic_launcher.png
--- a/android-app/src/main/res/drawable-hdpi/ic_launcher_window.png
+++ b/android-app/src/main/res/drawable-hdpi/ic_launcher_window.png
--- a/android-app/src/main/res/drawable-ldpi/.emptyfolder
+++ b/android-app/src/main/res/drawable-ldpi/.emptyfolder
--- a/android-app/src/main/res/drawable-ldpi/ab_icon.png
+++ b/android-app/src/main/res/drawable-ldpi/ab_icon.png
--- a/android-app/src/main/res/drawable-ldpi/kb_logo.png
+++ b/android-app/src/main/res/drawable-ldpi/kb_logo.png
--- a/android-app/src/main/res/drawable-mdpi/ab_clock.png
+++ b/android-app/src/main/res/drawable-mdpi/ab_clock.png
--- a/android-app/src/main/res/drawable-mdpi/ab_icon.png
+++ b/android-app/src/main/res/drawable-mdpi/ab_icon.png
--- a/android-app/src/main/res/drawable-mdpi/ab_logo.png
+++ b/android-app/src/main/res/drawable-mdpi/ab_logo.png
--- a/android-app/src/main/res/drawable-mdpi/ic_access_time_grey600_48dp.png
+++ b/android-app/src/main/res/drawable-mdpi/ic_access_time_grey600_48dp.png
--- a/android-app/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/android-app/src/main/res/drawable-mdpi/ic_launcher.png
--- a/android-app/src/main/res/drawable-mdpi/ic_launcher_window.png
+++ b/android-app/src/main/res/drawable-mdpi/ic_launcher_window.png
--- a/android-app/src/main/res/drawable-xhdpi/ab_clock.png
+++ b/android-app/src/main/res/drawable-xhdpi/ab_clock.png
--- a/android-app/src/main/res/drawable-xhdpi/ab_icon.png
+++ b/android-app/src/main/res/drawable-xhdpi/ab_icon.png
--- a/android-app/src/main/res/drawable-xhdpi/ab_logo.png
+++ b/android-app/src/main/res/drawable-xhdpi/ab_logo.png
--- a/android-app/src/main/res/drawable-xhdpi/ic_access_time_grey600_48dp.png
+++ b/android-app/src/main/res/drawable-xhdpi/ic_access_time_grey600_48dp.png
--- a/android-app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/android-app/src/main/res/drawable-xhdpi/ic_launcher.png
--- a/android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png
+++ b/android-app/src/main/res/drawable-xhdpi/ic_launcher_window.png
--- a/android-app/src/main/res/drawable-xxhdpi/ab_clock.png
+++ b/android-app/src/main/res/drawable-xxhdpi/ab_clock.png
--- a/android-app/src/main/res/drawable-xxhdpi/ab_logo.png
+++ b/android-app/src/main/res/drawable-xxhdpi/ab_logo.png
--- a/android-app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_48dp.png
+++ b/android-app/src/main/res/drawable-xxhdpi/ic_access_time_grey600_48dp.png
--- a/android-app/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/android-app/src/main/res/drawable-xxhdpi/ic_launcher.png
--- a/android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png
+++ b/android-app/src/main/res/drawable-xxhdpi/ic_launcher_window.png
--- a/android-app/src/main/res/drawable-xxxhdpi/ab_logo.png
+++ b/android-app/src/main/res/drawable-xxxhdpi/ab_logo.png
--- a/android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png
+++ b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher.png
--- a/android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png
+++ b/android-app/src/main/res/drawable-xxxhdpi/ic_launcher_window.png
--- a/android-app/src/main/res/menu/history_menu.xml
+++ b/android-app/src/main/res/menu/history_menu.xml
@ -33,7 +33,7 @@

 	<item
 		a:id="@+id/menu_history_toggle_datetime"
-		a:icon="@drawable/ic_access_time_grey600_48dp"
+		a:icon="@drawable/ab_clock"
 		a:title="@string/c_toggle_datetime"
 		app:showAsAction="ifRoom" />

--- a/android-app/src/main/res/values-ar/text_strings.xml
+++ b/android-app/src/main/res/values-ar/text_strings.xml
@ -117,8 +117,6 @@
  <string name="c_calc_show_release_notes_summary">يعرّف إذا كان يجب أن تظهر نافذة ملاحظات الإصدار بعد التحديث إلى الإصدار الجديد</string>
  <string name="c_calc_use_back_button_as_prev_summary">يحدد كيفية عمل زر الرجوع</string>
  <string name="c_calc_use_back_button_as_prev_title">استخدم زر الرجوع للحساب السابق</string>
-  <string name="c_clear_billing_info_summary">سيتم تحميل معلومات الشراء من المخدّم</string>
-  <string name="c_clear_billing_info_title">تحديث معلومات الشراء</string>
  <string name="c_warning">تحذير</string>
  <string name="c_error">خطأ</string>
  <string name="c_billing_error">الدفع بالفاتورة غير مدعم: يجب أن يكون لديك حساب في غوغل تشك أوت مرتبط بحساب الغوغل الخاص بك، ويجب أن تكون متصلاً بالإنترنت.</string>
--- a/android-app/src/main/res/values-ar/text_wizard.xml
+++ b/android-app/src/main/res/values-ar/text_wizard.xml
@ -4,8 +4,8 @@
 <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_finish">إنتهى</string>
  <string name="cpp_wizard_layout_optimized">محسّن</string>
  <string name="cpp_wizard_layout_big_buttons">أزرار كبيرة</string>
  <string name="cpp_wizard_mode_simple">بسيطة</string>
@ -17,14 +17,16 @@
  <string name="cpp_restart_wizard">بدء جولة الدليل</string>
  <string name="cpp_wizard_dragbutton_action_end">ممتاز! إضغط على الزر مرة أخرى لإعادة المحاولة</string>
  <string name="cpp_wizard_dragbutton_action_center">إضغط على الزر أدناه مرة واحدة لإستخدام الرقم 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">إضغط و اسحب من وسط الزر الى الأعلى لإستخدام %</string>
-  <string name="cpp_wizard_dragbutton_action_left">إضغط و اسحب من وسط الزر الى اليسار لإستخدام الجيب</string>
-  <string name="cpp_wizard_dragbutton_action_down">إضغط و اسحب من وسط الزر الى الأسفل لإستخدام ^2</string>
+  <string name="cpp_wizard_dragbutton_action_up">امسح من مركز الزر الى الاعلى لاستخدام %</string>
+  <string name="cpp_wizard_dragbutton_action_left">امسح من مركز الزر الى اليسار</string>
+  <string name="cpp_wizard_dragbutton_action_down">امسح من مركز الزر الى الاسفل لاستخدام التربيع</string>
  <string name="cpp_wizard_welcome_title">أهلاً</string>
  <string name="cpp_wizard_layout_title">إختر تصميم</string>
  <string name="cpp_wizard_mode_title">اختر نمط</string>
+  <string name="cpp_wizard_theme_title">اختر المظهر</string>
  <string name="cpp_wizard_onscreen_calculator_title">آلة حاسبة في نافذة منفصلة</string>
-  <string name="cpp_wizard_dragbutton_title">إضغط و اسحب على أساسيات الزر</string>
+  <string name="cpp_wizard_dragbutton_title">تغيير للازرار الاساسيّه</string>
+  <string name="cpp_wizard_final_done">تم ضبط التطبيق ، جاهز للاستخدام.</string>
  <string name="cpp_wizard_final_title">أوشكت على الإنتهاء!</string>
  <string name="cpp_wizard_final_free_and_opensource">الآلة الحاسبة++ مجانية و مفتوحة المصدر: جميع الميزات بالمجان، ويمكن العثور على الرماز المصدري في github.</string>
  <string name="cpp_wizard_final_ways_to_help">هناك عدة طرق يمكنك عن طريقها المساعدة على جعل هذا التطبيق أفضل:</string>
@ -32,7 +34,9 @@
  <string name="cpp_wizard_final_translate">ترجمة</string>
  <string name="cpp_wizard_final_contribute">ساهم برماز مصدري</string>
  <string name="cpp_wizard_onscreen_description">الآلة الحاسبة ذات النافذة المنفصلة تسمح لك بالقيام بعمليات حسابية أثناء استخدام تطبيقات أخرى على جهازك</string>
-  <string name="cpp_wizard_onscreen_checkbox">تفعيل الحاسبة في نافذة منفصلة (الأيقونة الثانية سوف تظهر في قائمة التطبيقات)</string>
+  <string name="cpp_wizard_onscreen_checkbox">تمكين</string>
  <string name="cpp_wizard_dragbutton_description">السحب على الزر هي ميزة حصرية في هذه الآلة الحاسبة++ اللتي بدورها توفر الوصول السريع إلى وظائف الثانوي</string>
  <string name="cpp_wizard_finish_confirmation">هل تريد حقاً إنهاء جولة الدليل؟</string>
+  <string name="cpp_wizard_skip">تخطي</string>
+  <string name="cpp_wizard_finish_confirmation_title">انهاء؟</string>
 </resources>
--- a/android-app/src/main/res/values-cs/text_strings.xml
+++ b/android-app/src/main/res/values-cs/text_strings.xml
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Definuje jestli okno s poznámkami k nové verzi by se mělo objevit po aktualizaci na novou verzi</string>
  <string name="c_calc_use_back_button_as_prev_summary">Definuje chování tlačítka Zpět</string>
  <string name="c_calc_use_back_button_as_prev_title">Použijte tlačítko Zpět na předchozí v historii</string>
-  <string name="c_clear_billing_info_summary">Informace o platbě budou znovu načteny ze serveru</string>
-  <string name="c_clear_billing_info_title">Aktualizovat informace o platbě</string>
  <string name="c_warning">Upozornění</string>
  <string name="c_error">Chyba</string>
  <string name="c_billing_error">Účtování není podporováno: musíte mít Google Checkout účet spojený s vaším Google účtem a musíte být připojen k Internetu.</string>
--- a/android-app/src/main/res/values-cs/text_wizard.xml
+++ b/android-app/src/main/res/values-cs/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Pokračovat</string>
  <string name="cpp_wizard_back">Zpět</string>
-  <string name="cpp_wizard_finish">Dokončit</string>
  <string name="cpp_wizard_start">Spustit průvodce</string>
+  <string name="cpp_wizard_finish">Dokončeno</string>
  <string name="cpp_wizard_layout_optimized">Optimalizováno</string>
  <string name="cpp_wizard_layout_big_buttons">Velká tlačítka</string>
  <string name="cpp_wizard_mode_simple">Jednoduché</string>
@ -15,14 +15,16 @@
  <string name="cpp_restart_wizard">Spustit průvodce</string>
  <string name="cpp_wizard_dragbutton_action_end">Vynikající! Klepnutím na tlačítko můžete zopakovat ještě jednou</string>
  <string name="cpp_wizard_dragbutton_action_center">Stiskněte tlačítko pro devítku</string>
-  <string name="cpp_wizard_dragbutton_action_up">Táhněte ze středu tlačítka nahoru pro procento</string>
-  <string name="cpp_wizard_dragbutton_action_left">Táhněte ze středu tlačítka doleva pro funkci sinus</string>
-  <string name="cpp_wizard_dragbutton_action_down">Táhněte ze středu tlačítka dolů pro druhou mocninu</string>
+  <string name="cpp_wizard_dragbutton_action_up">Tahem ze středu tlačítka nahoru pro použití %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Tahem ze středu tlačítka doleva pro použití sin</string>
+  <string name="cpp_wizard_dragbutton_action_down">Tahem ze středu tlačítka dolu pro použití ^2</string>
  <string name="cpp_wizard_welcome_title">Vítejte</string>
  <string name="cpp_wizard_layout_title">Zvolte rozložení</string>
  <string name="cpp_wizard_mode_title">Zvolte mód</string>
+  <string name="cpp_wizard_theme_title">Vybrat motiv</string>
  <string name="cpp_wizard_onscreen_calculator_title">Kalkulačka v odděleném okně</string>
-  <string name="cpp_wizard_dragbutton_title">Posunování tlačítek</string>
+  <string name="cpp_wizard_dragbutton_title">Swipe button basics</string>
+  <string name="cpp_wizard_final_done">Aplikace je nastavená a připravená k použití.</string>
  <string name="cpp_wizard_final_title">Skoro hotovo!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ je open-source: všechny funkce jsou zdarma a zdrojový kód lze nalézt na github.</string>
  <string name="cpp_wizard_final_ways_to_help">Je několik možností, jak pomoci ke zdokonalení této aplikace: </string>
@ -30,7 +32,9 @@
  <string name="cpp_wizard_final_translate">Překlad</string>
  <string name="cpp_wizard_final_contribute">Vylepšování a přispívání ke zdrojovému kódu</string>
  <string name="cpp_wizard_onscreen_description">Kalkulačka v odděleném okně umožňuje provádění kalkulací při používání jiných aplikací</string>
-  <string name="cpp_wizard_onscreen_checkbox">Povolit kalkulačku v odděleném okně (v seznamu aplikací se zobrazí druhá ikona)</string>
+  <string name="cpp_wizard_onscreen_checkbox">Povolit</string>
  <string name="cpp_wizard_dragbutton_description">Tažení tlačítka je exkluzivní funkce aplikace Calculator++, která umožňuje rychlý přístup k sekundárním funkcím</string>
  <string name="cpp_wizard_finish_confirmation">Opravdu chcete ukončit průvodce?</string>
+  <string name="cpp_wizard_skip">Přeskočit</string>
+  <string name="cpp_wizard_finish_confirmation_title">Dokončit?</string>
 </resources>
--- a/android-app/src/main/res/values-de/text_strings.xml
+++ b/android-app/src/main/res/values-de/text_strings.xml
@ -64,8 +64,8 @@
  <string name="p_metro_blue_theme">Metro Blau</string>
  <string name="p_metro_green_theme">Metro Grün</string>
  <string name="p_metro_purple_theme">Metro Lila</string>
-  <string name="p_material_theme">Material</string>
-  <string name="p_material_light_theme">Material Light</string>
+  <string name="p_material_theme">Material-Design</string>
+  <string name="p_material_light_theme">Material-Design hell</string>
  <string name="c_calc_result_precision_summary">Genauigkeit des Resultats (alle Berechnungen sind mit höchster Genauigkeit unabhängig von dieser Option)</string>
  <string name="c_calc_color_display_summary">Schaltet Farbe und Stil des Editors um</string>
  <string name="c_calc_theme_summary">Setzt den Stil für den Rechner</string>
@ -85,7 +85,7 @@
  <string name="c_calc_layout_summary">Layout der Tasten setzen</string>
  <string name="c_calc_haptic_feedback_title">Haptische Rückmeldung</string>
  <string name="c_calc_haptic_feedback_summary">Vibration beim Tastendruck ein-/ausschalten</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Deaktiviert</string>
  <string name="p_calc_haptic_feedback_strength_short">Kurz</string>
  <string name="p_calc_haptic_feedback_strength_middle">Mittel</string>
  <string name="p_calc_haptic_feedback_strength_long">Lang</string>
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Definiert, ob ein Popup-Fenster mit den Versionshinweisen nach einer Programmaktualisierung angezeigt werden soll.</string>
  <string name="c_calc_use_back_button_as_prev_summary">Definiert das Verhalten des Zurückknopfs</string>
  <string name="c_calc_use_back_button_as_prev_title">Verwende den Zurückknopf um im Verlauf zurückzuspringen</string>
-  <string name="c_clear_billing_info_summary">Kaufinformation wird vom Server nachgeladen werden</string>
-  <string name="c_clear_billing_info_title">Kaufinformation aktualisieren</string>
  <string name="c_warning">Warnung</string>
  <string name="c_error">Fehler</string>
  <string name="c_billing_error">Abrechnung ist nicht unterstützt: Sie müssen ein Google Checkout Konto haben,
@ -225,9 +223,9 @@ Klicken Sie auf \"Weiter\" und Sie werden zu Google Play weitergeleitet, wo Sie
  <string name="cpp_purchase_title">Kaufen</string>
  <string name="cpp_var_show_greek_keyboard">Zeige griechische Buchstaben</string>
  <string name="cpp_var_hide_greek_keyboard">Verstecke griechische Buchstaben</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>
+  <string name="cpp_clear_history_title">Verlauf löschen?</string>
+  <string name="cpp_clear_history_message">Der gesamte Verlauf wird gelöscht werden.</string>
+  <string name="cpp_clear_history">Löschen</string>
+  <string name="cpp_new_in_version">Neu in Version %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Wollen Sie das neue Material-Design ausprobieren? Wählen sie aus der Liste:</string>
 </resources>
--- a/android-app/src/main/res/values-de/text_wizard.xml
+++ b/android-app/src/main/res/values-de/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Weiter</string>
  <string name="cpp_wizard_back">Zurück</string>
-  <string name="cpp_wizard_finish">Fertig</string>
  <string name="cpp_wizard_start">Wizard starten</string>
+  <string name="cpp_wizard_finish">Fertig</string>
  <string name="cpp_wizard_layout_optimized">Optimiert</string>
  <string name="cpp_wizard_layout_big_buttons">Große Tasten</string>
  <string name="cpp_wizard_mode_simple">Einfach</string>
@ -17,14 +17,16 @@ Ergebnisse werden nicht gerundet und es wird die wissenschaftliche Notation verw
  <string name="cpp_restart_wizard">Assistenten starten</string>
  <string name="cpp_wizard_dragbutton_action_end">Ausgezeichnet! Tippen Sie auf die Schaltfläche um es noch einmal zu versuchen</string>
  <string name="cpp_wizard_dragbutton_action_center">Tippen Sie einmal auf die Schaltfläche unten, um die 9 zu verwenden</string>
-  <string name="cpp_wizard_dragbutton_action_up">Ziehen Sie von der Mitte der Taste nach oben, um % zu verwenden</string>
-  <string name="cpp_wizard_dragbutton_action_left">Ziehen Sie von der Mitte der Taste nach links, um sin zu verwenden</string>
-  <string name="cpp_wizard_dragbutton_action_down">Ziehen Sie von der Mitte der Taste nach unten, um ^2 zu verwenden </string>
+  <string name="cpp_wizard_dragbutton_action_up">Wische von der Mitte des Buttons nach oben um % (Prozent) zu benutzen</string>
+  <string name="cpp_wizard_dragbutton_action_left">Wische von der Mitte des Buttons nach links um den Sinus zu verwenden</string>
+  <string name="cpp_wizard_dragbutton_action_down">Wische von der Mitte des Buttons nach unten um ^2 (Quadrat) zu verwenden</string>
  <string name="cpp_wizard_welcome_title">Willkommen</string>
  <string name="cpp_wizard_layout_title">Layout wählen</string>
  <string name="cpp_wizard_mode_title">Modus wählen</string>
+  <string name="cpp_wizard_theme_title">Wähle das Theme aus</string>
  <string name="cpp_wizard_onscreen_calculator_title">Rechner in einem abgetrennten Fenster</string>
-  <string name="cpp_wizard_dragbutton_title">Wischknopfgrundlagen</string>
+  <string name="cpp_wizard_dragbutton_title">Wischfunktionen</string>
+  <string name="cpp_wizard_final_done">Die Aps ist eingerichtet und zur Benutzung bereit.</string>
  <string name="cpp_wizard_final_title">Fast fertig!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ ist eine freie und offene Software: alle Funktionen sind kostenlos
 und der Quelltext kann auf GitHub gefunden werden.</string>
@ -33,7 +35,9 @@ und der Quelltext kann auf GitHub gefunden werden.</string>
  <string name="cpp_wizard_final_translate">Übersetzen</string>
  <string name="cpp_wizard_final_contribute">Quellcode beitragen</string>
  <string name="cpp_wizard_onscreen_description">Der Rechner im separaten Fenster ermöglicht es Ihnen zu rechnen, während dem benutzen anderer Apps.</string>
-  <string name="cpp_wizard_onscreen_checkbox">Rechner im separaten Fenster aktivieren (zweites Symbol erscheint in der Liste der Anwendungen)</string>
-  <string name="cpp_wizard_dragbutton_description">Wischschaltflächen sind eine exklusive Funktion des Calculator++, die schnellen Zugriff auf die sekundären Funktionen bietet</string>
+  <string name="cpp_wizard_onscreen_checkbox">Einschalten</string>
+  <string name="cpp_wizard_dragbutton_description">Die Wischfunktion ist eine Besonderheit von Calculator++ um Tasten mehrfach zu belegen</string>
  <string name="cpp_wizard_finish_confirmation">Wollen Sie den Assistenten wirklich beenden?</string>
+  <string name="cpp_wizard_skip">Überspringen</string>
+  <string name="cpp_wizard_finish_confirmation_title">Fertig?</string>
 </resources>
--- a/android-app/src/main/res/values-el/text_about.xml
+++ b/android-app/src/main/res/values-el/text_about.xml
@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_about">Σχετικά με</string>
-  <string name="c_about_content">Πνευματικά δικαιώματα © 2009–2013\n\n<b>Δημιουργήθηκε από τον serso γνωστός και ως se.solovyev</b>\n\n
-Θα μας βρήτε και στο Facebook: <a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n
- Το πρόγραμμα αυτό διανέμεται σύμφωνα με πιστοποίηση Apache 2.0 :\nο πηγαίος κώδικας μπορεί να βρεθεί παρακάτω\n
-<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n
-Για περισσότερες πληροφορίες παρακαλώ\nεπικοινωνήστε με τον φημιουργό μέσω ηλεκτρονικού ταχυδρομείου\n
-<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>
-\nor visit\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n
-αν θέλετε να στηρίξετε το έργο \n του συγγραφέα και να εποφεληθήτε απο μια ειδική έκδοση στις προτιμήσεις της εφαρμογήςγής\n\n
-αν σας αρέσε η εφαρμογή \n βαθμολογήστε με 5 αστέρια\n
-<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n
-This application uses next open source libraries:\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">Η εφαρμογή αυτή μεταφράστηκε στα Ελληνικά από: </string>
-  <string name="cpp_translators_list">Sergey Solovyev</string>
-  <string name="c_release_notes">Σημειώσεις έκδοσης</string>
-  <string name="c_release_notes_for_title">"Σημειώσεις έκδοσης για την έκδοση "</string>
-  <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_functions.xml
+++ b/android-app/src/main/res/values-el/text_functions.xml
@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_functions">Συνάρτηση</string>
-  <string name="c_fun_description_sin">Τριγωνομετρική συνάρτηση ημιτόνου</string>
-  <string name="c_fun_description_cos">Τριγωνομετρική συνάρτηση συνημιτόνου</string>
-  <string name="c_fun_description_tan">Τριγωνομετρική συνάρτηση εφαπτομένης</string>
-  <string name="c_fun_description_cot">Τριγωνομετρική συνάρτηση συνεφαπτομένης</string>
-  <string name="c_fun_description_asin">Αντίστροφη συνάρτηση του ημιτόνου</string>
-  <string name="c_fun_description_acos">Αντίστροφη συνάρτηση του συνημιτόνου</string>
-  <string name="c_fun_description_atan">Αντίστροφη συνάρτηση της εφαπτομένης</string>
-  <string name="c_fun_description_acot">Αντίστροφη συνάρτηση της συνεφαπτομένης</string>
-  <string name="c_fun_description_ln">νεπεριος λογαριθμος - λογάριθμος με βάση e</string>
-  <string name="c_fun_description_lg">Δεκαδικός λογάριθμος - λογάριθμος με βάση 10</string>
-  <string name="c_fun_description_log">Λογάριθμος - λογάριθμος με καθορισμένη βάση</string>
-  <string name="c_fun_description_exp">Εκθετική συνάρτηση</string>
-  <string name="c_fun_description_sqrt">Τετραγωνική ρίζα</string>
-  <string name="c_fun_description_cubic">Κυβική ρίζα</string>
-  <string name="c_fun_description_abs">Επιστρέφει την απόλυτη τιμή</string>
-  <string name="c_fun_description_sgn">Επιστρέφει τη τιμή ενός επιχειρήματος: -1 αν ένα επιχείρημα είναι μικρότερη από 0, 0
-αν ισούται με 0, 1, εάν μεγαλύτερο από 0</string>
-  <string name="c_fun_description_eq">Συνάρτηση ισοτητας - επιστρέφει 1 εάν δύο επιχειρήματα είναι ίσα, αλλιώς 0</string>
-  <string name="c_fun_description_le">Μικρότερο ή-ίσον - δίνει 1 εάν δύο επιχειρήματα είναι ίσα ή το πρώτο είναι μικρότερο
-από το δεύτερο, αλλιώς 0</string>
-  <string name="c_fun_description_ge">Μεγαλύτερο-ή-ίσον - δίνει 1 εάν δύο επιχειρήματα είναι ίσα ή το πρώτο είναι
-μεγαλύτερο από το δεύτερο, αλλιώς 0</string>
-  <string name="c_fun_description_ne">Συνάρτηση ανισότητας- δίνει 1 εάν δύο επιχειρήματα δεν είναι ίσα, αλλιώς 0</string>
-  <string name="c_fun_description_lt">Μικρότερο - δίνει 1 εάν το πρώτο επιχείρημα είναι μικρότερο από το δεύτερο, αλλιώς 0</string>
-  <string name="c_fun_description_gt">Μεγαλύτερο - δίνει 1 εάν το πρώτο επιχείρημα είναι μεγαλύτερο από το δεύτερο, αλλιώς 0</string>
-  <string name="c_fun_description_rad">Μετατρέπει τις μοίρες σε ακτίνια: d - μοίρες, m - λεπτά (προεπιλογή = 0), s -
-δευτερόλεπτα (προεπιλογή = 0)</string>
-  <string name="c_fun_description_dms">Μετατρέπει τις μοίρες από DMS σημειογραφία σε δεκαδική μορφή: d - μοίρες, μ -
-λεπτά (προεπιλογή = 0), s - δευτερόλεπτα (προεπιλογή = 0)</string>
-  <string name="c_fun_description_deg">Μετατρέπει τα ακτίνια σε μοίρες</string>
-  <string name="c_fun_category_trig">Τριγωνομετρικές</string>
-  <string name="c_fun_category_hyper_trig">Υπερβολική τριγωνομετρική</string>
-  <string name="c_fun_category_comparison">Σύγκριση</string>
-  <string name="c_fun_category_common">Κοινή</string>
-  <string name="c_fun_category_my">Δικό μου</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_operators.xml
+++ b/android-app/src/main/res/values-el/text_operators.xml
@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_operators">Τελεστές</string>
-  <string name="c_op_description_mod">Η λειτουργία Modulo βρίσκει το υπόλοιπο της διαίρεσης του \'x\' με το \'y\'</string>
-  <string name="c_op_description_sum">Η συνάρτηση αθροίσματος \'f(i)\', "τρέχει" για \'i\' από \'from\' μέχρι \'to\'
-	</string>
-  <string name="c_op_description_product">Δίνει το γινόμενο πολλών \'f(i)\', "τρέχει" για \'i\' από \'from\'
-		μέχρι \'to\'
-	</string>
-  <string name="c_op_description_derivative">Δίνει παράγωγο της τάξης \'order\' (προκαθορισμένο = 1) από τις συναρτήσεις \'f(x)\'
-		με \'x\' μεταβλητή και υπολογίζει στο σημείο \'x_point\' (προκαθορισμένο = ίδιο με \'x\')
-	</string>
-  <string name="c_op_description_integral">Δίνει ολοκλήρωμα της συνάρτησης \'f(x)\' με \'x\' μεταβλητή</string>
-  <string name="c_op_description_integral_ab">Ολοκληρώνει τη συνάρτηση \'f(x)\' με \'x\' μεταβλητή από το \'a\' στο \'b\'
-	</string>
-  <string name="c_pf_description_factorial">Δίνει το παραγοντικό της προηγούμενης έκφρασης</string>
-  <string name="c_pf_description_double_factorial">Δίνει το διπλό παραγοντικό της προηγούμενης έκφρασης</string>
-  <string name="c_pf_description_percent" formatted="false">Δίνει την ποσοστιαία τιμή της προηγούμενης έκφρασης
-		.\nΠαραδείγματα:\n
-		100 + 50% = 150\n
-		100 * 50% = 50\n
-		100 + 100 * 50% * 50% = 125
-	</string>
-  <string name="c_pf_description_degree">Μετατρέπει μοίρες σε ακτίνια.\n
-		Παραδείσματα:\n
-		268° = 4.67748\n
-		30.21° = 0.52726
-	</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_preferences.xml
+++ b/android-app/src/main/res/values-el/text_preferences.xml
@ -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">Αυτόματη περιστροφή οθόνης</string>
-  <string name="c_auto_orientation_summary">Άμα ενεργοποιηθεί η εφαρμογή θα περιστρέφεται με την συσκευή</string>
-  <string name="c_show_equals_button_title">Εμφάνισε το κουμπί ισοτητας</string>
-  <string name="c_show_equals_button_summary">Εάν είναι ενεργοποιημένο το κουμπί  ισούτητας εμφανίζεται</string>
-  <string name="c_hide_numeral_base_digits_title">Απόκρυψη ψηφίων άλλων αριθμητικών συστημάτων</string>
-  <string name="c_hide_numeral_base_digits_summary">Αμα ειναι ενεργοποιημένο βάσεις άλλων αριθμητικών συστημάτων δεν θα εμφανίζονται</string>
-  <string name="prefs_history_show_intermediate_calculations_title">Εμφάνιση ενδιάμεσων υπολογισμών στο ιστορικό</string>
-  <string name="prefs_history_show_intermediate_calculations_summary">Εάν είναι ενεργοποιημένο όλοι οι υπολογισμοί θα εμφανίζωνται στο ιστορικό</string>
-  <string name="p_calculations_calculate_on_fly_title">Το αποτέλεσμα υπολογίζεται κατά την πληκτρολόγηση</string>
-  <string name="p_calculations_calculate_on_fly_summary">Εάν είναι ενεργοποιημένο το αποτέλεσμα θα υπολογίζεται κατά την πληκτρολόγηση</string>
-  <string name="prefs_prevent_screen_from_fading_title">Αποτροπή του φωτισμός της οθόνης από εξασθαίνηση</string>
-  <string name="prefs_prevent_screen_from_fading_summary">Εάν είναι ενεργοποιημένο ο φωτισμός της οθόνης δεν θα εξασθενησει κατά τη χρήση της εφαρμογής</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_strings.xml
+++ b/android-app/src/main/res/values-el/text_strings.xml
@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_app_name">Calculator++</string>
-  <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-  <string name="c_app_settings">Ρυθμίσεις</string>
-  <string name="c_result_copied">Το αποτέλεσμα έχει αντιγραφεί στο clipboard!</string>
-  <string name="c_settings">Ρυθμίσεις</string>
-  <string name="c_help">Βοήθεια</string>
-  <string name="c_vars_and_constants">Μεταβλητές και Σταθερές</string>
-  <string name="c_prefs_calculations_category">Ρυθμίσεις υπολογισμών</string>
-  <string name="c_prefs_appearance_category">Ρυθμίσεις εμφάνισης</string>
-  <string name="c_prefs_other_category">Άλλες ρυθμίσεις</string>
-  <string name="c_undo">αναίρεση</string>
-  <string name="c_redo">επανάληψη</string>
-  <string name="c_clear">Καθαρισμός</string>
-  <string name="c_vars">μεταβλητές</string>
-  <string name="c_copy">Αντιγραφή</string>
-  <string name="c_plot">Plot graph</string>
-  <string name="c_graph">Γράφημα</string>
-  <string name="c_calc_color_display_title">Highlight expressions</string>
-  <string name="c_calc_round_result_title">Στρογγυλοποίηση αποτελέσματος</string>
-  <string name="c_calc_round_result_summary">Toggles rounding of the result</string>
-  <string name="c_calc_science_notation_title">Always scientific notation</string>
-  <string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output
-		(12.34E-12)
-	</string>
-  <string name="p_calc_result_precision_title">Ακρίβεια αποτελέσματος</string>
-  <string name="p_calc_max_calculation_time_title">Μέγιστη διάρκεια υπολογισμού</string>
-  <string name="p_calc_max_calculation_time_summary">If calculations exceed specified limit - calculator halts with
-		error
-	</string>
-  <string name="c_exit">Έξοδος</string>
-  <string name="c_cancel">Ακύρωση</string>
-  <string name="c_save">Αποθήκευση</string>
-  <string name="c_remove">Αφαίρεση</string>
-  <string name="c_yes">Ναι</string>
-  <string name="c_no">Όχι</string>
-  <string name="removal_confirmation">Επιβεβαίωση αφαίρεσης</string>
-  <string name="c_var_removal_confirmation_question">Θέλετε σίγουρα να διαγράψετε την μεταβλητή \'%s\' ;</string>
-  <string name="c_var_name">Όνομα</string>
-  <string name="c_var_value">Τιμή</string>
-  <string name="c_var_description">Περιγραφή</string>
-  <string name="c_var_create_var">Δημιουργημένη μεταβλητή</string>
-  <string name="c_var_edit_var">Επεξεργασία μεταβλητής</string>
-  <string name="c_value_is_not_a_number">Η τιμή πρέπει να είναι νούμερο ή να μείνει άδεια: εάν έχετε παραμέτρους - καλύτερα δημιουργήστε μια συνάρτηση!
-	</string>
-  <string name="c_var_name_clashes">Το όνομα μεταβλητής "συγκρούεται" με το όνομα της συνάρτησης.</string>
-  <string name="c_var_already_exists">Μεταβλητή με το ίδιο όνομα υπάρχει ήδη.</string>
-  <string name="c_name_is_not_valid">Το όνομα της σταθεράς δεν είναι έγκυρο: το όνομα πρέπει να ξεκινά με γράμμα, μπορεί να περιέχει γράμματα,
-		ψηφία και κάτω παύλες.
-	</string>
-  <string name="c_calc_editor_hint">Εισάγετε νέα έκφραση</string>
-  <string name="c_history">Ιστορικό</string>
-  <string name="c_history_button">Μ</string>
-  <string name="c_char_is_not_accepted">Ο χαρακτήρας \'%s\' δεν είναι αποδεκτός σε όνομα μεταβλητής!</string>
-  <string name="c_calc_angle_units">Τρέχουσες μονάδες γωνίας</string>
-  <string name="p_deg">Μοίρες</string>
-  <string name="p_rad">Ακτίνια</string>
-  <string name="p_grad">Gradians</string>
-  <string name="p_turns">Γύροι</string>
-  <string name="c_angle_units_summary">Ορίζει τις μονάδες γωνίας που θα χρησιμοποιούνται στους υπολογισμούς!</string>
-  <string name="c_calc_numeral_bases">Τρέχον αριθμητικό σύστημα</string>
-  <string name="c_numeral_bases_summary">Ορίζει το αριθμητικό σύστημα που θα χρησιμοποιηθεί στους υπολογισμούς!</string>
-  <string name="p_dec">Δεκαδικό</string>
-  <string name="p_hex">Δεκαεξαδικό</string>
-  <string name="p_oct">Οκταδικό</string>
-  <string name="p_bin">Δυαδικό</string>
-  <string name="c_calc_theme">Θέμα</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</string>
-  <string name="c_calc_result_precision_summary">Ακρίβεια τιμής αποτελέσματος (όλοι οι υπολογισμοί γίνονται με τη μεγαλύτερη ακρίβεια
-				ασχέτως της τιμής αυτής της επιλογής)
-	</string>
-  <string name="c_calc_color_display_summary">Toggles colouring and styling in the calculator editor</string>
-  <string name="c_calc_theme_summary">Ορίζει το θέμα της αριθμομηχανής</string>
-  <string name="c_toggle_datetime">Εμφάνιση/απόκρυψη ημερομηνίας</string>
-  <string name="p_grouping_separator_no">Κανένα διαχωριστικό ομαδοποίησης</string>
-  <string name="p_grouping_separator_apostrophe">Απόστροφος (\')</string>
-  <string name="p_grouping_separator_space">Κενό ( )</string>
-  <string name="c_calc_grouping_separator">Διαχωριστικό ομαδοποίησης</string>
-  <string name="c_calc_grouping_separator_summary">Ορίζει διαχωριστικό ομαδοποίησης</string>
-  <string name="c_calc_multiplication_sign">Σύμβολο πολλαπλασιασμού</string>
-  <string name="c_calc_multiplication_sign_summary">Ορίζει το σύμβολο του πολλαπλασιασμού</string>
-  <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_calculator">Scientific</string>
-  <string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
-  <string name="p_layout_simple">Simple</string>
-  <string name="p_layout_simple_mobile">Simple (Big buttons)</string>
-  <string name="c_calc_layout_summary">Sets layout of buttons</string>
-  <string name="c_calc_haptic_feedback_title">Haptic feedback</string>
-  <string name="c_calc_haptic_feedback_summary">Toggles vibration on button click</string>
-  <string name="p_calc_haptic_feedback_strength_short">Short</string>
-  <string name="p_calc_haptic_feedback_strength_middle">Middle</string>
-  <string name="p_calc_haptic_feedback_strength_long">Long</string>
-  <string name="empty_var_error">Unable to create empty constant!</string>
-  <string name="not_valid_result">Current result is not valid!</string>
-  <string name="c_plot_graph">Graph</string>
-  <string name="c_min_x_value">From</string>
-  <string name="c_max_x_value">To</string>
-  <string name="c_expression_copied">Expression copied to the clipboard!</string>
-  <string name="c_use">Use</string>
-  <string name="c_use_short">Use</string>
-  <string name="c_copy_expression">Copy expression</string>
-  <string name="c_copy_result">Copy result</string>
-  <string name="c_history_expression">Value</string>
-  <string name="c_history_comment">Comment</string>
-  <string name="c_save_history">Save history</string>
-  <string name="c_edit_history">Modify history</string>
-  <string name="c_edit">Modify</string>
-  <string name="c_saved_history">Saved history</string>
-  <string name="c_history_already_saved">History was already saved!</string>
-  <string name="c_history_must_be_saved">History must be saved before editing!</string>
-  <string name="c_history_was_removed">History has been successfully removed!</string>
-  <string name="c_history_saved">History has been successfully saved!</string>
-  <string name="c_copy_description">Copy description</string>
-  <string name="c_copy_value">Copy value</string>
-  <string name="c_first_start_text">Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making
-		everyday calculations.
-	</string>
-  <string name="c_calc_show_release_notes_title">Show release notes</string>
-  <string name="c_calc_show_release_notes_summary">Defines if release notes popup window should appear after update to
-		the new version
-	</string>
-  <string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
-  <string name="c_calc_use_back_button_as_prev_title">Use Back button for previous history</string>
-  <string name="c_clear_billing_info_summary">Purchase information will be reloaded from the server</string>
-  <string name="c_clear_billing_info_title">Update purchase information</string>
-  <string name="c_warning">Warning</string>
-  <string name="c_error">Error</string>
-  <string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google
-		account and must be connected to the internet.
-	</string>
-  <string name="c_calc_ad_free_title">Support the project</string>
-  <string name="c_calc_ad_free_summary">And remove the advertisement</string>
-  <string name="c_calc_already_purchased">Ad free option has been already purchased!</string>
-  <string name="c_feedback_text">You have been using Calculator++ for some time \n
-		and it\'s important for us to know your opinion about application.\n\n
-		Please rate Calculator++ \non<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
-			Google Play</a>,\n leave a comment or \ndiscuss the application \non
-		<a href="http://facebook.com/calculatorpp">Facebook</a>
-	</string>
-  <string name="c_angle_units_changed_to">Angle units have been changed to \'%s\'!</string>
-  <string name="c_numeral_base_changed_to">Numeral base has been changed to \'%s\'!</string>
-  <string name="c_conversion_tool">Conversion tool</string>
-  <string name="c_convert">Convert to…</string>
-  <string name="convert_to_hex">Convert to hex</string>
-  <string name="convert_to_bin">Convert to bin</string>
-  <string name="convert_to_dec">Convert to dec</string>
-  <string name="editor">Editor</string>
-  <string name="result">Result</string>
-  <string name="other">Other</string>
-  <string name="derivatives">Derivatives/Integrals</string>
-  <string name="crashed">Calculator++ has crashed…</string>
-  <string name="prefs_graph_screen_title">Graph settings</string>
-  <string name="p_white_line_color">White</string>
-  <string name="p_grey_line_color">Grey</string>
-  <string name="p_red_line_color">Red</string>
-  <string name="p_blue_line_color">Blue</string>
-  <string name="p_green_line_color">Green</string>
-  <string name="c_function_name">Name</string>
-  <string name="c_function_value">Value</string>
-  <string name="c_function_description">Description</string>
-  <string name="c_function_parameters">Parameters</string>
-  <string name="function_create_function">Create function</string>
-  <string name="function_edit_function">Edit function</string>
-  <string name="function_name_is_not_valid">Name of function is not valid: name must start with a letter, can contain
-		letters, digits and underscore.
-	</string>
-  <string name="function_already_exists">Function with the same name already exists!</string>
-  <string name="function_is_empty">Function body could not be empty!</string>
-  <string name="function_param_not_empty">Function parameter should not be empty!</string>
-  <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
-  <string name="empty_function_error">Unable to create empty function!</string>
-  <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
-  <string name="calculation_messages_dialog_title">Calculator++ warning</string>
-  <string name="ok">OK</string>
-  <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
-  <string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations
-		special dialog will be shown
-	</string>
-  <string name="fix">Fix</string>
-  <string name="p_preferred_numeral_base_title">Default numeral system</string>
-  <string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
-  <string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot
-		to change back?
-	</string>
-  <string name="p_preferred_angle_units_title">Default angle units</string>
-  <string name="p_preferred_angle_units_summary">Defines the default angle units</string>
-  <string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to
-		change back?
-	</string>
-  <string name="close">Close</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">Click to open calculator in window mode</string>
-  <string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
-  <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
-  <string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after
-		device boot
-	</string>
-  <string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
-  <string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list
-	</string>
-  <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
-  <string name="cpp_plot_2d">2D plot</string>
-  <string name="cpp_plot_3d">3D plot</string>
-  <string name="cpp_plot_functions">Graph functions</string>
-  <string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
-  <string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
-  <string name="cpp_monochrome_line_color_type">Monochrome</string>
-  <string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
-  <string name="cpp_solid_line_style">Solid (-----)</string>
-  <string name="cpp_dashed_line_style">Dashed (- - -)</string>
-  <string name="cpp_dotted_line_style">Dotted (. . .)</string>
-  <string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
-  <string name="cpp_plotter">Function plotter</string>
-  <string name="cpp_plot_screenshot">Capture screenshot</string>
-  <string name="cpp_plot_screenshot_saved">Screenshot has been successfully saved: %1$s!</string>
-  <string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD
-		card and try again!
-	</string>
-  <string name="cpp_plot_function_line_color_type">Line color type</string>
-  <string name="cpp_plot_function_line_color">Line color</string>
-  <string name="cpp_plot_function_line_style">Line style</string>
-  <string name="cpp_plot_function_line_width">Line width</string>
-  <string name="cpp_plot_function_settings">Function settings</string>
-  <string name="cpp_function">Function</string>
-  <string name="cpp_pinned">Pinned</string>
-  <string name="cpp_visible">Visible</string>
-  <string name="cpp_plot_button_text">+plot</string>
-  <string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
-  <string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
-  <string name="cpp_plot_range">Graph range</string>
-  <string name="cpp_fullscreen">Fullscreen</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">Y Max</string>
-  <string name="cpp_invalid_number">Invalid number!</string>
-  <string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
-  <string name="cpp_apply">Apply</string>
-  <string name="cpp_message">Message</string>
-  <string name="cpp_continue">Continue</string>
-  <string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
-		and all you need is a properly configured Google account.\n\n
-		Payment information is stored in Google servers with your Google account and you can easily use this application on
-		several devices.\n\n
-		By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.
-	</string>
-  <string name="cpp_purchase_title">Purchase</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_vars.xml
+++ b/android-app/src/main/res/values-el/text_vars.xml
@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="c_var_description_PI">Ratio of any circle\'s circumference to its diameter. Note: this constant is
-		degree unit dependent =&gt; rad: 3.14, deg: 180.0
-	</string>
-  <string name="c_var_description_pi">Ratio of any circle\'s circumference to its diameter. Note: this constant is
-		degree unit independent =&gt; rad: 3.14, deg: 3.14
-	</string>
-  <string name="c_var_description_e">Unique real number such that the value of the derivative (slope of the tangent
-		line) of the function f(x) = e^x at the point x = 0 is equal to 1
-	</string>
-  <string name="c_var_description_i">Imaginary unit, defined such as i^2 = −1</string>
-  <string name="c_var_description_c">Speed of the light in vacuum, m·s</string>
-  <string name="c_var_description_G">The gravitational constant is an empirical physical constant involved in the
-		calculation of the gravitational attraction between objects with mass, m^3·kg^−1·s^−2
-	</string>
-  <string name="c_var_description_h">Physical constant reflecting the sizes of energy quanta in quantum mechanics,
-		J·s
-	</string>
-  <string name="c_var_description_h_reduced">Reduced Planck constant, J·s</string>
-  <string name="c_var_description_nan">Δεν είναι νούμερο</string>
-  <string name="c_var_description_inf">Άπειρο</string>
-  <string name="c_var_system">Ενσωματωμένο</string>
-  <string name="c_var_my">My</string>
-</resources>
--- a/android-app/src/main/res/values-el/text_wizard.xml
+++ b/android-app/src/main/res/values-el/text_wizard.xml
@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
-<resources>
-  <string name="cpp_wizard_layout_optimized">Optimized</string>
-  <string name="cpp_wizard_layout_big_buttons">Μεγάλα κουμπιά</string>
-  <string name="cpp_wizard_mode_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">Μηχανικός</string>
-  <string name="cpp_wizard_mode_engineer_description">In engineer mode special functions will be used on the main
-		screen.
-		Result is is not rounded and is presented in engineer notation, radians are used as the default angle units.
-	</string>
-  <string name="cpp_restart_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">Drag from the center of the button up to use %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Drag from the center of the button to the left to use sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Drag from the center of the button down to use ^2</string>
-  <string name="cpp_wizard_welcome_title">Καλώς ήρθατε</string>
-  <string name="cpp_wizard_layout_title">Επιλέξτε μορφή</string>
-  <string name="cpp_wizard_mode_title">Επιλέξτε τρόπο</string>
-  <string name="cpp_wizard_onscreen_calculator_title">Calculator in a separate window</string>
-  <string name="cpp_wizard_dragbutton_title">Drag button basics</string>
-  <string name="cpp_wizard_final_title">Σχεδόν έτοιμο!</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">Δωρεά χρημάτων</string>
-  <string name="cpp_wizard_final_translate">Μετάφραση</string>
-  <string name="cpp_wizard_final_contribute">Συμβολή πηγαίου κώδικα</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 calculator in separate window (second icon will appear in the
-		apps list)
-	</string>
-  <string name="cpp_wizard_dragbutton_description">Drag button is an exclusive feature of Calculator++ which provides
-		fast access to the secondary functions
-	</string>
-  <string name="cpp_wizard_finish_confirmation">Θέλετε σίγουρα να τελειώσετε τον οδηγό;</string>
-</resources>
--- a/android-app/src/main/res/values-es/text_strings.xml
+++ b/android-app/src/main/res/values-es/text_strings.xml
@ -119,8 +119,6 @@
  <string name="c_calc_show_release_notes_summary">Establece si la ventana emergente de las notas de versión debe aparecer tras actualizar a una nueva versión</string>
  <string name="c_calc_use_back_button_as_prev_summary">Establece el comportamiento del botón \"Atrás\"</string>
  <string name="c_calc_use_back_button_as_prev_title">Utilice el botón \"Atrás\" para volver al historial</string>
-  <string name="c_clear_billing_info_summary">Se volverá a cargar la información de compra desde el servidor</string>
-  <string name="c_clear_billing_info_title">Actualizar la información de compra</string>
  <string name="c_warning">Advertencia</string>
  <string name="c_error">Error</string>
  <string name="c_billing_error">No se admite el método de pago: debes disponer de una cuenta de Google Checkout asociada a tu cuenta de Google, y debes estar conectado a internet.</string>
--- a/android-app/src/main/res/values-es/text_wizard.xml
+++ b/android-app/src/main/res/values-es/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Siguiente</string>
  <string name="cpp_wizard_back">Atrás</string>
-  <string name="cpp_wizard_finish">Finalizar</string>
  <string name="cpp_wizard_start">Iniciar el asistente</string>
+  <string name="cpp_wizard_finish">Done</string>
  <string name="cpp_wizard_layout_optimized">Optimizado</string>
  <string name="cpp_wizard_layout_big_buttons">Botones grandes</string>
  <string name="cpp_wizard_mode_simple">Sencillo</string>
@ -17,14 +17,16 @@ El resultado no se redondea, y los radianes son la unidad de ángulo predetermin
  <string name="cpp_restart_wizard">Iniciar el asistente</string>
  <string name="cpp_wizard_dragbutton_action_end">¡Excelente! Pulse el botón una vez más para intentarlo de nuevo</string>
  <string name="cpp_wizard_dragbutton_action_center">Para utilizar 9, pulse una vez el botón situado abajo</string>
-  <string name="cpp_wizard_dragbutton_action_up">Arrastre desde el centro del botón hacia arriba para utilizar %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Arrastre desde el centro del botón hacia la izquierda para utilizar sen</string>
-  <string name="cpp_wizard_dragbutton_action_down">Arrastre desde el centro del botón hacia abajo para utilizar ^2</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">Bienvenido</string>
  <string name="cpp_wizard_layout_title">Elegir diseño</string>
  <string name="cpp_wizard_mode_title">Elegir modo</string>
+  <string name="cpp_wizard_theme_title">Choose theme</string>
  <string name="cpp_wizard_onscreen_calculator_title">Calculadora en ventana independiente</string>
-  <string name="cpp_wizard_dragbutton_title">Conceptos básicos del botón de arrastre</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">¡Casi está listo!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculadora ++ es gratuita y de código abierto: todas las funciones son gratuitas, y el código fuente puede encontrarse en github.</string>
  <string name="cpp_wizard_final_ways_to_help">Existen varias formas con las que puedes contribuir a mejorar esta aplicación:</string>
@ -32,8 +34,11 @@ El resultado no se redondea, y los radianes son la unidad de ángulo predetermin
  <string name="cpp_wizard_final_translate">Traduciendo a tu idioma</string>
  <string name="cpp_wizard_final_contribute">Contribuyendo al código fuente</string>
  <string name="cpp_wizard_onscreen_description">La calculadora en ventana independiente te permite realizar cálculos mientras utilizas otras aplicaciones en tu dispositivo</string>
-  <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_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">¿Realmente quiere finalizar el asistente?</string>
-	<string name="cpp_wizard_finish_confirmation_title">Finish?</string>
+  <string name="cpp_wizard_skip">Skip</string>
+  <string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
--- a/android-app/src/main/res/values-fi/text_strings.xml
+++ b/android-app/src/main/res/values-fi/text_strings.xml
@ -64,8 +64,8 @@
  <string name="p_metro_blue_theme">Metron Sininen</string>
  <string name="p_metro_green_theme">Metron vihreä</string>
  <string name="p_metro_purple_theme">Metro violetti</string>
-  <string name="p_material_theme">Material</string>
-  <string name="p_material_light_theme">Material Light</string>
+  <string name="p_material_theme">Materiaali</string>
+  <string name="p_material_light_theme">Materiaali vaalea</string>
  <string name="c_calc_result_precision_summary">Tarkkuus tuloksen arvoa (kaikki laskelmat ovat tehneet tarkkuudella riippumatta tämän asetuksen arvosta)  </string>
  <string name="c_calc_color_display_summary">Vaihtaa värin ja styling Laskin-editorissa</string>
  <string name="c_calc_theme_summary">Asettaa Teemaa  Laskimeen</string>
@ -85,7 +85,7 @@
  <string name="c_calc_layout_summary">Asetetaan ulkoasua painikkeet</string>
  <string name="c_calc_haptic_feedback_title">Haptic palaute</string>
  <string name="c_calc_haptic_feedback_summary">Vaihtaa tärinä-painiketta napsauttamalla</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Pois käytöstä</string>
  <string name="p_calc_haptic_feedback_strength_short">Lyhyt</string>
  <string name="p_calc_haptic_feedback_strength_middle">Keskellä</string>
  <string name="p_calc_haptic_feedback_strength_long">Pitkä</string>
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Määrittää, onko release notes popup ikkuna tulee näkyviin kun päivitys uuteen versioon</string>
  <string name="c_calc_use_back_button_as_prev_summary">Määrittelee niiden takaisin-painiketta</string>
  <string name="c_calc_use_back_button_as_prev_title">Napsauta Edellinen-painiketta aiempi</string>
-  <string name="c_clear_billing_info_summary">Tietoja ladataan palvelimesta</string>
-  <string name="c_clear_billing_info_title">Päivitä oston tiedot</string>
  <string name="c_warning">Varoitus</string>
  <string name="c_error">Error</string>
  <string name="c_billing_error">Laskutus ei tueta: sinulla on oltava Google Checkout-tiliisi yhdistetty Google-tiliin ja on yhteydessä Internetiin.</string>
@ -220,9 +218,9 @@
  <string name="cpp_purchase_title">Osta</string>
  <string name="cpp_var_show_greek_keyboard">Näytä kreikkalaiset kirjaimet</string>
  <string name="cpp_var_hide_greek_keyboard">Piilota kreikkalaiset kirjaimet</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>
+  <string name="cpp_clear_history_title">Tyhjennä historia?</string>
+  <string name="cpp_clear_history_message">Kaikki historia tyhjennetään.</string>
+  <string name="cpp_clear_history">Tyhjennä</string>
+  <string name="cpp_new_in_version">Uutta versiossa %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Haluatko kokeilla uusia materiaaliteemoja? Valitse luettelosta:</string>
 </resources>
--- a/android-app/src/main/res/values-fi/text_wizard.xml
+++ b/android-app/src/main/res/values-fi/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Seuraava</string>
  <string name="cpp_wizard_back">Takaisin</string>
-  <string name="cpp_wizard_finish">Lopeta</string>
  <string name="cpp_wizard_start">Aloita ohjattu asennus</string>
+  <string name="cpp_wizard_finish">Valmis</string>
  <string name="cpp_wizard_layout_optimized">Optimoitu</string>
  <string name="cpp_wizard_layout_big_buttons">Suuret painikkeet</string>
  <string name="cpp_wizard_mode_simple">Yksinkertaistettu</string>
@ -17,14 +17,16 @@ Vastauksia ei pyöristetä ja ne näytetään 10-potenssimuodossa, kulman oletus
  <string name="cpp_restart_wizard">Aloita ohjattu asennus</string>
  <string name="cpp_wizard_dragbutton_action_end">Loistavaa! Paina painiketta vielä kerran kokeillaksesi uudelleen</string>
  <string name="cpp_wizard_dragbutton_action_center">Paina alla olevaa painiketta kerran käyttääksesi 9:ä</string>
-  <string name="cpp_wizard_dragbutton_action_up">Vedä painikkeen keskeltä ylöspäin käyttääksesi %:a</string>
-  <string name="cpp_wizard_dragbutton_action_left">Vedä painikkeen keskeltä vasemmalle käyttääksesi siniä</string>
-  <string name="cpp_wizard_dragbutton_action_down">Vedä painikkeen keskeltä alaspäin käyttääksesi ^2:ta</string>
+  <string name="cpp_wizard_dragbutton_action_up">Pyyhkäise painikkeen keskeltä käyttääksesi %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Pyyhkäise painikkeen keskeltä vasemmalle käyttääksesi siniä</string>
+  <string name="cpp_wizard_dragbutton_action_down">Pyyhkäise painikkeen keskeltä alaspäin käyttääksesi ^2 -toimintoa</string>
  <string name="cpp_wizard_welcome_title">Tervetuloa</string>
  <string name="cpp_wizard_layout_title">Valitse asettelu</string>
  <string name="cpp_wizard_mode_title">Valitse tila</string>
+  <string name="cpp_wizard_theme_title">Valitse teema</string>
  <string name="cpp_wizard_onscreen_calculator_title">Laskin erillisessä ikkunassa</string>
-  <string name="cpp_wizard_dragbutton_title">Vedä painiketta -alkeet</string>
+  <string name="cpp_wizard_dragbutton_title">Pyyhkäise painikkeen perusteita</string>
+  <string name="cpp_wizard_final_done">Sovellus on määritetty ja käyttövalmis.</string>
  <string name="cpp_wizard_final_title">Melkein valmis!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ on ilmainen ja vapaan lähdekoodin ohjelma: kaikki toiminnot ovat ilmaisia ja lähdekoodi on löydettävissä Githubista.</string>
  <string name="cpp_wizard_final_ways_to_help">On monta tapaa, joilla voit auttaa parantamaan tätä ohjelmaa:</string>
@ -32,7 +34,9 @@ Vastauksia ei pyöristetä ja ne näytetään 10-potenssimuodossa, kulman oletus
  <string name="cpp_wizard_final_translate">Kääntämällä</string>
  <string name="cpp_wizard_final_contribute">Edistämällä lähdekoodia</string>
  <string name="cpp_wizard_onscreen_description">Laskin toimii erillisessä ikkunassa joka avulla voit tehdä laskelmia samaan aikaan, kun käytät muita ohjelmia laitteellasi</string>
-  <string name="cpp_wizard_onscreen_checkbox">Ota laskin käyttöön erillisessä ikkunassa (toinen kuvake ilmestyy sovelluslistaan)</string>
-  <string name="cpp_wizard_dragbutton_description">\"Drag button\" on yksinoikeudella Calculator++:ssa joka sallii nopean pääsyn toissijaisiin funktioihin</string>
+  <string name="cpp_wizard_onscreen_checkbox">Ota käyttöön</string>
+  <string name="cpp_wizard_dragbutton_description">Painikkeen pyyhkäisy on Calculator++:n erityisominaisuus, jolla pääsee nopeasti toissijaisiin toimintoihin</string>
  <string name="cpp_wizard_finish_confirmation">Oletko varma, että haluat lopettaa avustajan?</string>
+  <string name="cpp_wizard_skip">Ohita</string>
+  <string name="cpp_wizard_finish_confirmation_title">Valmis?</string>
 </resources>
--- a/android-app/src/main/res/values-fr/text_strings.xml
+++ b/android-app/src/main/res/values-fr/text_strings.xml
@ -40,7 +40,7 @@
  <string name="c_var_description">Description</string>
  <string name="c_var_create_var">Créer une variable</string>
  <string name="c_var_edit_var">Modifier les variables</string>
-  <string name="c_value_is_not_a_number">vous devez donner une valeur numérique ou ne rien donner du tout. si vous avez des paramètres - créez plutôt une fonction</string>
+  <string name="c_value_is_not_a_number">La valeur doit être un nombre ou laisser vide. Si vous avez des paramètres, créez plutôt une fonction !</string>
  <string name="c_var_name_clashes">Nom de variable en conflit avec le nom d\'une fonction !</string>
  <string name="c_var_already_exists">Une variable portant le même nom existe déjà !</string>
  <string name="c_name_is_not_valid">Le nom de la constante n\'est pas valide : le nom doit commencer par une lettre, peut contenir des lettres, chiffres et trait de soulignement.  </string>
@ -52,7 +52,7 @@
  <string name="p_deg">Degrés</string>
  <string name="p_rad">Radians</string>
  <string name="p_grad">Grades</string>
-  <string name="p_turns">Tourner</string>
+  <string name="p_turns">Tour</string>
  <string name="c_angle_units_summary">Définit les unités pour les angles à utiliser dans les calculs</string>
  <string name="c_calc_numeral_bases">Système numérique actuel</string>
  <string name="c_numeral_bases_summary">Définit le système de numération à utiliser dans les calculs</string>
@ -65,7 +65,7 @@
  <string name="p_metro_green_theme">Métro vert</string>
  <string name="p_metro_purple_theme">Métro violet</string>
  <string name="p_material_theme">Material</string>
-  <string name="p_material_light_theme">Material léger</string>
+  <string name="p_material_light_theme">Material Light</string>
  <string name="c_calc_result_precision_summary">Précision de la valeur du résultat (tous les calculs sont faits avec la précision maximale quelle que soit la valeur de cette option)</string>
  <string name="c_calc_color_display_summary">Choisir les couleurs et le style dans l\'éditeur de la calculatrice</string>
  <string name="c_calc_theme_summary">Définir le thème pour la calculatrice</string>
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Définit si la pop-up des informations à propos de la nouvelle version doit apparaître après une mise à jour.</string>
  <string name="c_calc_use_back_button_as_prev_summary">Définir le comportement du bouton Précédent</string>
  <string name="c_calc_use_back_button_as_prev_title">Utiliser le bouton Précédent pour le précédent de l\'historique</string>
-  <string name="c_clear_billing_info_summary">Les informations d\'achat vont être rechargées depuis le serveur</string>
-  <string name="c_clear_billing_info_title">Mettre à jour les informations d\'achat</string>
  <string name="c_warning">Attention</string>
  <string name="c_error">Erreur</string>
  <string name="c_billing_error">L\'achat n\'est pas supporté : vous devez avoir un compte Google Checkout (Wallet) lié avec votre compte Google et devez disposer d\'une connexion internet.</string>
@ -227,5 +225,5 @@ En cliquant sur le bouton \'Continuer\' vous serez redirigés vers l\'applicatio
  <string name="cpp_clear_history_message">L\'intégralité de l\'historique sera supprimée.</string>
  <string name="cpp_clear_history">Effacer</string>
  <string name="cpp_new_in_version">Nouveautés de la version %1$s</string>
-  <string name="cpp_release_notes_choose_theme">Voulez vous essayer les nouveaux thèmes Material ? Choisissez dans la liste :</string>
+  <string name="cpp_release_notes_choose_theme">Voulez-vous essayer les nouveaux thèmes Material ? Choisissez-en dans la liste :</string>
 </resources>
--- a/android-app/src/main/res/values-fr/text_wizard.xml
+++ b/android-app/src/main/res/values-fr/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Suivant</string>
  <string name="cpp_wizard_back">Retour</string>
-  <string name="cpp_wizard_finish">Terminer</string>
  <string name="cpp_wizard_start">Commencer l\'assistant</string>
+  <string name="cpp_wizard_finish">Fini</string>
  <string name="cpp_wizard_layout_optimized">Optimisé</string>
  <string name="cpp_wizard_layout_big_buttons">Gros boutons</string>
  <string name="cpp_wizard_mode_simple">Simple</string>
@ -17,14 +17,16 @@ Le résultat n\'est pas arrondi et est affiché en notation scientifique, le rad
  <string name="cpp_restart_wizard">Commencer l\'assistant</string>
  <string name="cpp_wizard_dragbutton_action_end">Excellent ! Touchez le bouton encore une fois pour réessayer</string>
  <string name="cpp_wizard_dragbutton_action_center">Appuyez sur le bouton ci-dessous une fois pour utiliser 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Glissez à partir du centre du bouton vers le haut pour utiliser %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Glissez à partir du centre du bouton vers la gauche pour utiliser sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Glissez à partir du centre du bouton vers le bas pour utiliser ^2</string>
+  <string name="cpp_wizard_dragbutton_action_up">Glisser vers le haut depuis le centre du bouton pour utiliser %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Glisser vers la gauche depuis le centre du bouton pour utiliser sin</string>
+  <string name="cpp_wizard_dragbutton_action_down">Glisser vers le bas depuis le centre du bouton pour utiliser ^2</string>
  <string name="cpp_wizard_welcome_title">Bienvenue</string>
  <string name="cpp_wizard_layout_title">Choisissez le mode d\'affichage</string>
  <string name="cpp_wizard_mode_title">Choisissez le mode</string>
+  <string name="cpp_wizard_theme_title">Choisir un thème</string>
  <string name="cpp_wizard_onscreen_calculator_title">Calculatrice dans une fenêtre séparée</string>
-  <string name="cpp_wizard_dragbutton_title">Les bases du bouton à glisser</string>
+  <string name="cpp_wizard_dragbutton_title">Bases du glissé de bouton</string>
+  <string name="cpp_wizard_final_done">L\'application est configurée et prête à être utilisée.</string>
  <string name="cpp_wizard_final_title">Presque fini !</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ est gratuit et open-source : toutes les fonctions sont gratuites et le code source est accessible sur github.</string>
  <string name="cpp_wizard_final_ways_to_help">Vous pouvez nous aider à améliorer cette application de plusieurs façons :</string>
@ -32,7 +34,9 @@ Le résultat n\'est pas arrondi et est affiché en notation scientifique, le rad
  <string name="cpp_wizard_final_translate">Traduction en cours</string>
  <string name="cpp_wizard_final_contribute">Contribution au code source</string>
  <string name="cpp_wizard_onscreen_description">Avoir la calculatrice ouverte dans une fenêtre séparée vous permet de calculer tout en utilisant les autres applications de votre appareil</string>
-  <string name="cpp_wizard_onscreen_checkbox">Activer la calculatrice dans une fenêtre séparée (une deuxième icône apparaîtra dans la liste des applications)</string>
+  <string name="cpp_wizard_onscreen_checkbox">Activer</string>
  <string name="cpp_wizard_dragbutton_description">Le glissement sur une touche est une fonctionnalité exclusive à Calculator++ ce qui permet un accès rapide aux fonctions secondaires</string>
  <string name="cpp_wizard_finish_confirmation">Quitter l\'assistant ?</string>
+  <string name="cpp_wizard_skip">Passer</string>
+  <string name="cpp_wizard_finish_confirmation_title">Terminé ?</string>
 </resources>
--- a/android-app/src/main/res/values-it/text_strings.xml
+++ b/android-app/src/main/res/values-it/text_strings.xml
@ -123,8 +123,6 @@
  <string name="c_calc_show_release_notes_summary">Definisce se la finestra popup delle note di versione debba comparire dopo l\'aggiornamento alla nuova versione</string>
  <string name="c_calc_use_back_button_as_prev_summary">Definisce il comportamento del pulsante Indietro</string>
  <string name="c_calc_use_back_button_as_prev_title">Usa il pulsante indietro per la cronologia precedente</string>
-  <string name="c_clear_billing_info_summary">Le Informazioni sugli acquisti verranno scaricate nuovamente dal server</string>
-  <string name="c_clear_billing_info_title">Aggiornare le informazioni di acquisto</string>
  <string name="c_warning">Attenzione</string>
  <string name="c_error">Errore</string>
  <string name="c_billing_error">La fatturazione non è supportata: si deve avere un account Google Checkout collegato all\'account Google e si deve essere collegati ad internet.</string>
--- a/android-app/src/main/res/values-it/text_wizard.xml
+++ b/android-app/src/main/res/values-it/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Successivo</string>
  <string name="cpp_wizard_back">Indietro</string>
-  <string name="cpp_wizard_finish">Termina</string>
  <string name="cpp_wizard_start">Avvia la procedura guidata</string>
+  <string name="cpp_wizard_finish">Done</string>
  <string name="cpp_wizard_layout_optimized">Ottimizzato</string>
  <string name="cpp_wizard_layout_big_buttons">Tasti grandi</string>
  <string name="cpp_wizard_mode_simple">Semplice</string>
@ -22,8 +22,10 @@ Il risultato non è arrotondato, ed è presentato in notazione scientifica, i ra
  <string name="cpp_wizard_welcome_title">Benvenuti</string>
  <string name="cpp_wizard_layout_title">Scegliere layout</string>
  <string name="cpp_wizard_mode_title">Scegliere modalità</string>
+  <string name="cpp_wizard_theme_title">Choose theme</string>
  <string name="cpp_wizard_onscreen_calculator_title">Calcolatrice in una finestra separata</string>
-  <string name="cpp_wizard_dragbutton_title">Nozioni di base di trascinamento pulsanti</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">Quasi fatto!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ è gratuito e open-source: tutte le funzionalità sono gratuite e il codice sorgente può essere trovato su github.</string>
  <string name="cpp_wizard_final_ways_to_help">Ci sono diversi modi per contribuire a rendere migliore questa app:</string>
@ -31,7 +33,11 @@ Il risultato non è arrotondato, ed è presentato in notazione scientifica, i ra
  <string name="cpp_wizard_final_translate">Contribuendo alla traduzione in altre lingue</string>
  <string name="cpp_wizard_final_contribute">Contribuendo al codice sorgente</string>
  <string name="cpp_wizard_onscreen_description">La calcolatrice in una finestra separata consente di fare calcoli durante l\'utilizzo di altre applicazioni sul dispositivo</string>
-  <string name="cpp_wizard_onscreen_checkbox">Abilitare la calcolatrice in una finestra separata (una seconda icona comparirà nell\'elenco applicazioni)</string>
-  <string name="cpp_wizard_dragbutton_description">Il trascinamento pulsanti è una funzione esclusiva di Calculator++ che permette un accesso rapido alle funzioni secondarie</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">Vuoi veramente terminare la procedura guidata?</string>
+  <string name="cpp_wizard_skip">Skip</string>
+  <string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
--- a/android-app/src/main/res/values-ja/text_strings.xml
+++ b/android-app/src/main/res/values-ja/text_strings.xml
@ -120,8 +120,6 @@
  <string name="c_calc_show_release_notes_summary">新しいバージョンに更新した際にリリースノートを表示するかどうか設定します</string>
  <string name="c_calc_use_back_button_as_prev_summary">戻るボタンの振る舞いを定義します</string>
  <string name="c_calc_use_back_button_as_prev_title">戻るボタンを履歴に使用します</string>
-  <string name="c_clear_billing_info_summary">購入情報はサーバーから再読み込みされます</string>
-  <string name="c_clear_billing_info_title">購入情報を更新</string>
  <string name="c_warning">警告</string>
  <string name="c_error">エラー</string>
  <string name="c_billing_error">購入はサポートされていません:Googleアカウントと紐付けられたGoogle Checkoutアカウントが必要で、インターネットに接続されている必要があります。</string>
--- a/android-app/src/main/res/values-ja/text_wizard.xml
+++ b/android-app/src/main/res/values-ja/text_wizard.xml
@ -4,8 +4,8 @@
 <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_finish">Done</string>
  <string name="cpp_wizard_layout_optimized">最適化</string>
  <string name="cpp_wizard_layout_big_buttons">大アイコン</string>
  <string name="cpp_wizard_mode_simple">シンプル</string>
@ -18,14 +18,16 @@
  <string name="cpp_restart_wizard">簡単セットアップ</string>
  <string name="cpp_wizard_dragbutton_action_end">お見事！まだ試したい場合は、ボタンをもう一度押してください。</string>
  <string name="cpp_wizard_dragbutton_action_center">9を入力するにはボタンを一度タップします</string>
-  <string name="cpp_wizard_dragbutton_action_up">%を入力するにはボタン中央を上にフリックします</string>
-  <string name="cpp_wizard_dragbutton_action_left">sinを入力するにはボタンの中央を左にフリックします</string>
-  <string name="cpp_wizard_dragbutton_action_down">^2を入力するにはボタンの中央を下にフリックします</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">ようこそ</string>
  <string name="cpp_wizard_layout_title">レイアウトを選択してください</string>
  <string name="cpp_wizard_mode_title">モードを選択してください</string>
+  <string name="cpp_wizard_theme_title">Choose theme</string>
  <string name="cpp_wizard_onscreen_calculator_title">分離したウィンドウでの電卓の利用</string>
-  <string name="cpp_wizard_dragbutton_title">ボタンフリックの基本動作</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">ほぼ完了です！</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++は無料でオープンソースです: すべての機能が無料で使え、ソースコードはgithubにて見ることができます。
 	</string>
@ -35,8 +37,11 @@
  <string name="cpp_wizard_final_contribute">ソースコードに貢献する</string>
  <string name="cpp_wizard_onscreen_description">別窓での電卓の利用を有効にすると、お使いのデバイスで別のアプリを利用中に電卓を利用することが出来ます
 	</string>
-  <string name="cpp_wizard_onscreen_checkbox">別窓での電卓の利用を有効にする(二つ目のアイコンがアプリのリストに表示されるようになります)</string>
-  <string name="cpp_wizard_dragbutton_description">ボタンフリックはCalculator++の特別な機能で、サブの関数群に素早くアクセスすることを可能とします。
+  <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">本当にウィザードを終了しますか？</string>
+  <string name="cpp_wizard_skip">Skip</string>
+  <string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
--- a/android-app/src/main/res/values-nl/text_strings.xml
+++ b/android-app/src/main/res/values-nl/text_strings.xml
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Bepaalt of versiewijzigingen popup scherm moet verschijnen na update naar de nieuwe versie</string>
  <string name="c_calc_use_back_button_as_prev_summary">Bepaalt het gedrag van de Terug knop</string>
  <string name="c_calc_use_back_button_as_prev_title">Gebruik Terug knop voor eerdere geschiedenis</string>
-  <string name="c_clear_billing_info_summary">Aankoop informatie wordt opnieuw geladen van de server</string>
-  <string name="c_clear_billing_info_title">Werk aankoop informatie bij</string>
  <string name="c_warning">Waarschuwing</string>
  <string name="c_error">Fout</string>
  <string name="c_billing_error">Afrekenen niet ondersteund: Google Checkout account moet gekoppeld zijn aan je Google account je moet verbonden zijn met internet.</string>
--- a/android-app/src/main/res/values-nl/text_wizard.xml
+++ b/android-app/src/main/res/values-nl/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Volgende</string>
  <string name="cpp_wizard_back">Terug</string>
-  <string name="cpp_wizard_finish">Voltooien</string>
  <string name="cpp_wizard_start">Wizard starten</string>
+  <string name="cpp_wizard_finish">Voltooid</string>
  <string name="cpp_wizard_layout_optimized">Geoptimaliseerd</string>
  <string name="cpp_wizard_layout_big_buttons">Grote knoppen</string>
  <string name="cpp_wizard_mode_simple">Eenvoudig</string>
@ -16,14 +16,16 @@ Resultaat is niet afgerond en wordt gepresenteerd in de ingenieursnotatie, radia
  <string name="cpp_restart_wizard">Wizard starten</string>
  <string name="cpp_wizard_dragbutton_action_end">Uitstekend! Tik nog eens op de knop om opnieuw te proberen</string>
  <string name="cpp_wizard_dragbutton_action_center">Tik eenmaal op de knop hieronder voor 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Sleep vanaf het midden van de knop om % te gebruiken</string>
-  <string name="cpp_wizard_dragbutton_action_left">Sleep vanaf het midden van de knop naar links om sin te gebruiken</string>
-  <string name="cpp_wizard_dragbutton_action_down">Sleep vanaf het midden van de knop naar beneden om ^ 2 te gebruiken</string>
+  <string name="cpp_wizard_dragbutton_action_up">Swipe vanaf het midden van de knop naar boven om % te gebruiken</string>
+  <string name="cpp_wizard_dragbutton_action_left">Swipe vanaf het midden van de knop naar links om sin te gebruiken</string>
+  <string name="cpp_wizard_dragbutton_action_down">Swipe vanaf het midden van de knop naar beneden om ^2 te gebruiken</string>
  <string name="cpp_wizard_welcome_title">Welkom</string>
  <string name="cpp_wizard_layout_title">Lay-out kiezen</string>
  <string name="cpp_wizard_mode_title">Kies modus</string>
+  <string name="cpp_wizard_theme_title">Kies thema</string>
  <string name="cpp_wizard_onscreen_calculator_title">Calculator in een afzonderlijk venster</string>
-  <string name="cpp_wizard_dragbutton_title">Sleep de knop basics</string>
+  <string name="cpp_wizard_dragbutton_title">De basis van de swipe knop</string>
+  <string name="cpp_wizard_final_done">De app is ingesteld en klaar voor gebruik.</string>
  <string name="cpp_wizard_final_title">Bijna klaar!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ is gratis en open-source: alle functies zijn gratis en de broncode kan worden gevonden op github. </string>
  <string name="cpp_wizard_final_ways_to_help">Er zijn verschillende manieren hoe u helpen kunt om deze app beter te maken: </string>
@ -31,7 +33,9 @@ Resultaat is niet afgerond en wordt gepresenteerd in de ingenieursnotatie, radia
  <string name="cpp_wizard_final_translate">Vertalen</string>
  <string name="cpp_wizard_final_contribute">Bijdragen aan de broncode</string>
  <string name="cpp_wizard_onscreen_description">Calculator in afzonderlijk venster kunt u berekeningen uitvoeren tijdens het gebruik van andere apps op uw apparaat </string>
-  <string name="cpp_wizard_onscreen_checkbox">Calculator in afzonderlijk venster inschakelen (het tweede pictogram wordt weergegeven in de appslijst) </string>
-  <string name="cpp_wizard_dragbutton_description">De sleepknop is een exclusieve functie van Calculator ++ die snel toegang tot de secundaire functies biedt </string>
+  <string name="cpp_wizard_onscreen_checkbox">Inschakelen</string>
+  <string name="cpp_wizard_dragbutton_description">Swipe knop is een exclusieve functie van Calculator++ die snel toegang tot de secundaire functies biedt</string>
  <string name="cpp_wizard_finish_confirmation">Wil je de wizard echt voltooien?</string>
+  <string name="cpp_wizard_skip">Overslaan</string>
+  <string name="cpp_wizard_finish_confirmation_title">Voltooien?</string>
 </resources>
--- a/android-app/src/main/res/values-pl/text_strings.xml
+++ b/android-app/src/main/res/values-pl/text_strings.xml
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Określa, czy okno z informacjami o wydaniu ma pojawić się po aktualizacji programu</string>
  <string name="c_calc_use_back_button_as_prev_summary">Określa zachowanie przycisku Wstecz</string>
  <string name="c_calc_use_back_button_as_prev_title">Użyj przycisku Wstecz do przywracania historii</string>
-  <string name="c_clear_billing_info_summary">Informacja o zakupie będzie ponownie pobrana z serwera</string>
-  <string name="c_clear_billing_info_title">Aktualizuj informację o zakupie</string>
  <string name="c_warning">Ostrzeżenie</string>
  <string name="c_error">Błąd</string>
  <string name="c_billing_error">Zakup nie jest możliwy: musisz posiadać konto Google Checkout połączone z kontem Google oraz musi być aktywne połączenie z Internetem.</string>
--- a/android-app/src/main/res/values-pl/text_wizard.xml
+++ b/android-app/src/main/res/values-pl/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Dalej</string>
  <string name="cpp_wizard_back">Wstecz</string>
-  <string name="cpp_wizard_finish">Koniec</string>
  <string name="cpp_wizard_start">Rozpocznij konfigurację</string>
+  <string name="cpp_wizard_finish">Done</string>
  <string name="cpp_wizard_layout_optimized">Zoptymalizowany</string>
  <string name="cpp_wizard_layout_big_buttons">Duże przyciski</string>
  <string name="cpp_wizard_mode_simple">Prosty</string>
@ -17,14 +17,16 @@ Wynik nie jest zaokrąglony i jest przedstawiony w postaci inżynierskiej, a dom
  <string name="cpp_restart_wizard">Zacznij konfigurację</string>
  <string name="cpp_wizard_dragbutton_action_end">Świetnie! Stuknij w przycisk jeszcze raz, aby spróbować ponownie</string>
  <string name="cpp_wizard_dragbutton_action_center">Stuknij raz w przycisk poniżej, aby użyć 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Przeciągnij ze środka przycisku do góry, aby użyć %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Przeciągnij ze środka przycisku w lewo, aby użyć sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Przeciągnij ze środka przycisku w dół, aby użyć ^2</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">Witaj</string>
  <string name="cpp_wizard_layout_title">Wybierz styl</string>
  <string name="cpp_wizard_mode_title">Wybierz tryb</string>
+  <string name="cpp_wizard_theme_title">Choose theme</string>
  <string name="cpp_wizard_onscreen_calculator_title">Kalkulator w osobnym oknie</string>
-  <string name="cpp_wizard_dragbutton_title">Podstawy przeciągania po przycisku</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">Prawie gotowe!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ jest darmowym i otwartym oprogramowaniem: wszystkie opcje są bezpłatne, a kod źródłowy można znaleźć w serwisie github.
 	</string>
@ -33,7 +35,11 @@ Wynik nie jest zaokrąglony i jest przedstawiony w postaci inżynierskiej, a dom
  <string name="cpp_wizard_final_translate">Tłumaczenie</string>
  <string name="cpp_wizard_final_contribute">Rozwijanie kodu źródłowego</string>
  <string name="cpp_wizard_onscreen_description">Kalkulator w osobnym oknie pozwoli Ci wykonywać obliczenia w trakcie korzystania z innych aplikacji na Twoim urządzeniu</string>
-  <string name="cpp_wizard_onscreen_checkbox">Włącz kalkulator w osobnym oknie (pojawi się druga ikona na liście aplikacji)</string>
-  <string name="cpp_wizard_dragbutton_description">Przeciąganie po przycisku jest wyjątkowym rozwiązaniem w programie Calculator++, które zapewnia szybki dostęp do alternatywnych funkcji</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">Czy na pewno chcesz zakończyć konfigurację?</string>
+  <string name="cpp_wizard_skip">Skip</string>
+  <string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
--- a/android-app/src/main/res/values-pt-rbr/text_strings.xml
+++ b/android-app/src/main/res/values-pt-rbr/text_strings.xml
@ -116,8 +116,6 @@
  <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>
--- a/android-app/src/main/res/values-pt-rbr/text_wizard.xml
+++ b/android-app/src/main/res/values-pt-rbr/text_wizard.xml
@ -4,8 +4,8 @@
 <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_finish">Concluído</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>
@ -15,14 +15,16 @@
  <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_up">Arraste do centro para o topo do botão para usar %</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_theme_title">Escolha o tema</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_dragbutton_title">Noções básicas dos botões</string>
+  <string name="cpp_wizard_final_done">O aplicativo está instalado e pronto para o uso.</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>
@ -30,7 +32,9 @@
  <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_onscreen_checkbox">Ativar</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>
+  <string name="cpp_wizard_skip">Pular</string>
+  <string name="cpp_wizard_finish_confirmation_title">Terminar?</string>
 </resources>
--- a/android-app/src/main/res/values-pt-rpt/text_strings.xml
+++ b/android-app/src/main/res/values-pt-rpt/text_strings.xml
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Define se a pop-up de notas de lançamento deve aparecer após a atualização para a nova versão</string>
  <string name="c_calc_use_back_button_as_prev_summary">Define o comportamento do botão Back</string>
  <string name="c_calc_use_back_button_as_prev_title">Usar o botão Voltar para 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">Aviso</string>
  <string name="c_error">Erro</string>
  <string name="c_billing_error">Compras não suportadas: deve ter a conta no Google Checkout ligada à sua conta do Google e deve estar ligado à internet.</string>
--- a/android-app/src/main/res/values-pt-rpt/text_wizard.xml
+++ b/android-app/src/main/res/values-pt-rpt/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Seguinte</string>
  <string name="cpp_wizard_back">Voltar</string>
-  <string name="cpp_wizard_finish">Terminar</string>
  <string name="cpp_wizard_start">Inicie o wizard</string>
+  <string name="cpp_wizard_finish">Concluído</string>
  <string name="cpp_wizard_layout_optimized">Optimizado</string>
  <string name="cpp_wizard_layout_big_buttons">Botões grandes</string>
  <string name="cpp_wizard_mode_simple">Simples</string>
@ -17,23 +17,27 @@ O resultado não é arredondado e é apresentado em notação de engenheiro, rad
  <string name="cpp_restart_wizard">Inicie o wizard</string>
  <string name="cpp_wizard_dragbutton_action_end">Excelente! Toque no botão novamente para voltar a tentar</string>
  <string name="cpp_wizard_dragbutton_action_center">Toque no botão uma vez para utilizar o 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Arraste a partir do centro do botão para cima para utilizar %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Arraste a partir do centro do botão para a esquerda para utilizar sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Arraste a partir do centro do botão para baixo para utilizar x^2</string>
+  <string name="cpp_wizard_dragbutton_action_up">Arraste do centro para cima para usar %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Arraste do centro para esquerda para usar o seno</string>
+  <string name="cpp_wizard_dragbutton_action_down">Arraste do centro para baixo para elevar ao quadrado</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_theme_title">Escolha o tema</string>
  <string name="cpp_wizard_onscreen_calculator_title">Calculadora numa janela separada</string>
-  <string name="cpp_wizard_dragbutton_title">Arraste a base do botão</string>
+  <string name="cpp_wizard_dragbutton_title">Acione a tecla basics</string>
+  <string name="cpp_wizard_final_done">O aplicativo está configurado e pronto para o uso.</string>
  <string name="cpp_wizard_final_title">Quase feito!</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ é livre e open-source: todas as funcionalidades são livres de pagamento e o código fonte pode ser encontrado no github.</string>
  <string name="cpp_wizard_final_ways_to_help">Há várias formas de ajudar e fazer esta app melhor:</string>
-  <string name="cpp_wizard_final_donate">Doando dinheiro</string>
+  <string name="cpp_wizard_final_donate">Doar dinheiro</string>
  <string name="cpp_wizard_final_translate">Traduzindo</string>
  <string name="cpp_wizard_final_contribute">Contribuindo para o código fonte</string>
  <string name="cpp_wizard_onscreen_description">A calculadora numa janela separada permite-lhe fazer cálculos enquanto utiliza outras aplicações no seu dispositivo</string>
-  <string name="cpp_wizard_onscreen_checkbox">Activas a calculador numa janela separada (um segundo ícone irá aparecer na lista de aplicações)</string>
-  <string name="cpp_wizard_dragbutton_description">Botão de arrasto é uma característica exclusiva da Calculadora + + que fornece
-acesso rápido às funções secundárias</string>
+  <string name="cpp_wizard_onscreen_checkbox">Habilitado</string>
+  <string name="cpp_wizard_dragbutton_description">A função de arrastar teclas é exclusiva do Calculator++, o que permite
+acesso mais ágil às funções secundárias</string>
  <string name="cpp_wizard_finish_confirmation">Deseja mesmo terminar o wizard?</string>
+  <string name="cpp_wizard_skip">Pular</string>
+  <string name="cpp_wizard_finish_confirmation_title">Encerrar?</string>
 </resources>
--- a/android-app/src/main/res/values-ru/text_release_notes.xml
+++ b/android-app/src/main/res/values-ru/text_release_notes.xml
@ -273,4 +273,10 @@
 		6. Другие исправления и улучшения
 	</string>

+	<string name="c_release_notes_for_141">
+		★ Улучшен ввод жестами\n
+		★ Быстрое удаление текста при долгом нажатии кнопки "Удалить"\n
+		★ Кнопка "Равно" копирует результат в поле ввода
+	</string>
+
 </resources>
--- a/android-app/src/main/res/values-ru/text_strings.xml
+++ b/android-app/src/main/res/values-ru/text_strings.xml
@ -132,8 +132,6 @@
 	</string>
  <string name="c_calc_use_back_button_as_prev_summary">Устанавливает поведение по нажатию на кнопку Назад</string>
  <string name="c_calc_use_back_button_as_prev_title">Использовать кнопку назад как назад по истории</string>
-  <string name="c_clear_billing_info_summary">Информация о покупках будет обновлена с сервера</string>
-  <string name="c_clear_billing_info_title">Обновить информацию о покупках</string>
  <string name="c_warning">Внимание</string>
  <string name="c_error">Ошибка</string>
  <string name="c_billing_error">Биллинг не поддерживается: вы должны иметь Google Checkout аккаунт привязанный в
--- a/android-app/src/main/res/values-ru/text_wizard.xml
+++ b/android-app/src/main/res/values-ru/text_wizard.xml
@ -5,6 +5,7 @@
  <string name="cpp_wizard_next">Далее</string>
  <string name="cpp_wizard_back">Назад</string>
  <string name="cpp_wizard_start">Начать визард</string>
+  <string name="cpp_wizard_finish">Готово</string>
  <string name="cpp_wizard_layout_optimized">Оптимизированная</string>
  <string name="cpp_wizard_layout_big_buttons">С большими кнопками</string>
  <string name="cpp_wizard_mode_simple">Простой</string>
@ -20,6 +21,7 @@
  <string name="cpp_wizard_welcome_title">Приветствие</string>
  <string name="cpp_wizard_layout_title">Выберите раскладку</string>
  <string name="cpp_wizard_mode_title">Выберите режим</string>
+  <string name="cpp_wizard_theme_title">Выберите тему</string>
  <string name="cpp_wizard_onscreen_calculator_title">Калькулятор в отдельном окне</string>
  <string name="cpp_wizard_dragbutton_title">Основы использования кнопок</string>
  <string name="cpp_wizard_final_done">Приложение настроено и готово к использованию.</string>
@ -31,11 +33,8 @@
  <string name="cpp_wizard_final_contribute">Поучавствовать в разработке</string>
  <string name="cpp_wizard_onscreen_description">Калькулятор в отдельном окне позволяет вам произодить вычисления не закрывая при этом другие приложения</string>
  <string name="cpp_wizard_onscreen_checkbox">Включить</string>
-  <string name="cpp_wizard_dragbutton_description">Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора
-	</string>
+  <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_wizard_skip">Пропустить</string>
-	<string name="cpp_wizard_finish_confirmation_title">Закончить?</string>
+  <string name="cpp_wizard_skip">Пропустить</string>
+  <string name="cpp_wizard_finish_confirmation_title">Закончить?</string>
 </resources>
--- a/android-app/src/main/res/values-uk/text_strings.xml
+++ b/android-app/src/main/res/values-uk/text_strings.xml
@ -68,8 +68,8 @@
  <string name="p_metro_blue_theme">Метро Синя</string>
  <string name="p_metro_green_theme">Метро Зелена</string>
  <string name="p_metro_purple_theme">Метро Пурпурова</string>
-  <string name="p_material_theme">Material</string>
-  <string name="p_material_light_theme">Material Light</string>
+  <string name="p_material_theme">Матеріал</string>
+  <string name="p_material_light_theme">Світлий матеріал</string>
  <string name="c_calc_result_precision_summary">Точність відображення результату (усі обчислення проводяться максимально точно, незалежно від цього параметру)
 	</string>
  <string name="c_calc_color_display_summary">Увімкнути/вимкнути підсвітку у редакторі калькулятора</string>
@ -90,7 +90,7 @@
  <string name="c_calc_layout_summary">Задає розкладку кнопок</string>
  <string name="c_calc_haptic_feedback_title">Вібрація при натисканні</string>
  <string name="c_calc_haptic_feedback_summary">Увімкнути/вимкнути вібрацію при натисканні</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Вимкнено</string>
  <string name="p_calc_haptic_feedback_strength_short">Коротка</string>
  <string name="p_calc_haptic_feedback_strength_middle">Середня</string>
  <string name="p_calc_haptic_feedback_strength_long">Велика</string>
@ -124,8 +124,6 @@
 	</string>
  <string name="c_calc_use_back_button_as_prev_summary">Визначити поведінку кнопку Назад</string>
  <string name="c_calc_use_back_button_as_prev_title">Кнопка Назад як крок назад по історії</string>
-  <string name="c_clear_billing_info_summary">Інформація про купівлю буде оновлена із сервера</string>
-  <string name="c_clear_billing_info_title">Очистити інформацію про купівлю</string>
  <string name="c_warning">Увага</string>
  <string name="c_error">Помилка</string>
  <string name="c_billing_error">Біллінг не підтримується: ви повинні мати обліковий запис Google Checkout, пов’язаний
@ -236,9 +234,9 @@
  <string name="cpp_purchase_title">Придбати</string>
  <string name="cpp_var_show_greek_keyboard">Показати грецьких літер</string>
  <string name="cpp_var_hide_greek_keyboard">Приховати грецьких літер</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>
+  <string name="cpp_clear_history_title">Очистити історію?</string>
+  <string name="cpp_clear_history_message">Очищено усю історію.</string>
+  <string name="cpp_clear_history">Очистити</string>
+  <string name="cpp_new_in_version">Нове у версії %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Кортить спробувати нові теми Матеріал? Вибирайте одну з них у списку:</string>
 </resources>
--- a/android-app/src/main/res/values-uk/text_wizard.xml
+++ b/android-app/src/main/res/values-uk/text_wizard.xml
@ -4,8 +4,8 @@
 <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_finish">Зроблено</string>
  <string name="cpp_wizard_layout_optimized">Оптимізована</string>
  <string name="cpp_wizard_layout_big_buttons">Великі кнопки</string>
  <string name="cpp_wizard_mode_simple">Простий</string>
@ -15,14 +15,16 @@
  <string name="cpp_restart_wizard">Запустити майстер</string>
  <string name="cpp_wizard_dragbutton_action_end">Відмінно! Натисніть кнопку ще раз, щоб спробувати знову</string>
  <string name="cpp_wizard_dragbutton_action_center">Натисніть на кнопку нижче один раз, щоб використати 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Проведіть пальцем від центру кнопки вгору, аби використати %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Проведіть пальцем від центру кнопки вліво, аби використати sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Проведіть пальцем від центру кнопки донизу, аби використати ^2</string>
+  <string name="cpp_wizard_dragbutton_action_up">Проведіть пальцем від центру кнопки для використання %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Проведіть пальцем від центру кнопки вліво для використання sin</string>
+  <string name="cpp_wizard_dragbutton_action_down">Проведіть пальцем від центру кнопки донизу для використання ^2</string>
  <string name="cpp_wizard_welcome_title">Вітаємо</string>
  <string name="cpp_wizard_layout_title">Оберіть розкладку</string>
  <string name="cpp_wizard_mode_title">Оберіть режим</string>
+  <string name="cpp_wizard_theme_title">Вибрати тему</string>
  <string name="cpp_wizard_onscreen_calculator_title">Калькулятор++ в окремому вікні</string>
-  <string name="cpp_wizard_dragbutton_title">Робота з кнопками</string>
+  <string name="cpp_wizard_dragbutton_title">Основи роботи з кнопками</string>
+  <string name="cpp_wizard_final_done">Програма налаштована і готова до використання.</string>
  <string name="cpp_wizard_final_title">Майже готово!</string>
  <string name="cpp_wizard_final_free_and_opensource">Калькулятор++ є вільним для розповсюдження і з відкритим програмним кодом: всі можливості надаються безкоштовно і вихідний код можна знайти на github.</string>
  <string name="cpp_wizard_final_ways_to_help">Наявні декілька способів, за допомогти яких ви можете зробити цю програму кращою:</string>
@ -30,7 +32,9 @@
  <string name="cpp_wizard_final_translate">Перекласти на іншу мову</string>
  <string name="cpp_wizard_final_contribute">Взяти участь в розробці програми</string>
  <string name="cpp_wizard_onscreen_description">Калькулятор в окремому вікні - дає змогу виконувати розрахунки під час використання інших програм на вашому пристрої</string>
-  <string name="cpp_wizard_onscreen_checkbox">Увімкнути калькулятор в окремому вікні (додаткова іконка з\'явиться у списку програм)</string>
-  <string name="cpp_wizard_dragbutton_description">Кнопки з розширеними функціями є винятковою рисою Калькулятор++, які забезпечують швидкий доступ до додаткових функцій</string>
+  <string name="cpp_wizard_onscreen_checkbox">Увімкнути</string>
+  <string name="cpp_wizard_dragbutton_description">Кнопки зсуву є винятковою рисою Калькулятор++, які забезпечують швидкий доступ до додаткових функцій</string>
  <string name="cpp_wizard_finish_confirmation">Ви дійсно бажаєте вийти з майстра?</string>
+  <string name="cpp_wizard_skip">Пропустити</string>
+  <string name="cpp_wizard_finish_confirmation_title">Завершити?</string>
 </resources>
--- a/android-app/src/main/res/values-vi/text_strings.xml
+++ b/android-app/src/main/res/values-vi/text_strings.xml
@ -85,7 +85,7 @@
  <string name="c_calc_layout_summary">Bộ bố trí của nút</string>
  <string name="c_calc_haptic_feedback_title">Thông tin phản hồi Haptic</string>
  <string name="c_calc_haptic_feedback_summary">Chuyển rung khi bấm nút</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Đã vô hiệu</string>
  <string name="p_calc_haptic_feedback_strength_short">Ngắn</string>
  <string name="p_calc_haptic_feedback_strength_middle">Trung bình</string>
  <string name="p_calc_haptic_feedback_strength_long">Dài</string>
@ -116,8 +116,6 @@
  <string name="c_calc_show_release_notes_summary">Xác định nếu cửa sổ bật lên ghi chú phát hành sẽ xuất hiện sau khi cập nhật lên phiên bản mới</string>
  <string name="c_calc_use_back_button_as_prev_summary">Xác định các hành vi của nút Back</string>
  <string name="c_calc_use_back_button_as_prev_title">Sử dụng nút Back cho lịch sử trước đó</string>
-  <string name="c_clear_billing_info_summary">Thông tin mua sẽ được nạp lại từ máy chủ</string>
-  <string name="c_clear_billing_info_title">Cập nhật thông tin mua</string>
  <string name="c_warning">Cảnh báo</string>
  <string name="c_error">Lỗi</string>
  <string name="c_billing_error">Thanh toán không được hỗ trợ: bạn phải có tài khoản Google Checkout được liên kết với tài khoản Google của bạn và phải được kết nối với internet.</string>
@ -226,9 +224,9 @@ Qua việc click nút \'Tiếp tục\' bạn được chuyển qua úng dụng G
  <string name="cpp_purchase_title">Mua</string>
  <string name="cpp_var_show_greek_keyboard">Hiện các kí tự La Mã</string>
  <string name="cpp_var_hide_greek_keyboard">Ẩn các ký tự La Mã</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>
+  <string name="cpp_clear_history_title">Xóa lược sử?</string>
+  <string name="cpp_clear_history_message">Tất cả lược sử sẽ bị xoá.</string>
+  <string name="cpp_clear_history">Dọn sạch</string>
+  <string name="cpp_new_in_version">Mới trong phiên bản %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Bạn có muốn thử chủ đề Material mới? Chọn chúng từ danh sách:</string>
 </resources>
--- a/android-app/src/main/res/values-vi/text_wizard.xml
+++ b/android-app/src/main/res/values-vi/text_wizard.xml
@ -4,8 +4,8 @@
 <resources>
  <string name="cpp_wizard_next">Tiếp theo</string>
  <string name="cpp_wizard_back">Trở lại</string>
-  <string name="cpp_wizard_finish">Hoàn thành</string>
  <string name="cpp_wizard_start">Khởi động thuật sĩ</string>
+  <string name="cpp_wizard_finish">Hoàn thành</string>
  <string name="cpp_wizard_layout_optimized">Tối ưu hóa</string>
  <string name="cpp_wizard_layout_big_buttons">Các nút lớn</string>
  <string name="cpp_wizard_mode_simple">Đơn giản</string>
@ -15,14 +15,16 @@
  <string name="cpp_restart_wizard">Khởi động thuật sĩ</string>
  <string name="cpp_wizard_dragbutton_action_end">Tuyệt vời! Bấm vào nút một lần nữa để thử lại</string>
  <string name="cpp_wizard_dragbutton_action_center">Bấm vào nút bên dưới một lần để sử dụng 9</string>
-  <string name="cpp_wizard_dragbutton_action_up">Kéo từ Trung tâm của nút lên trên để sử dụng %</string>
-  <string name="cpp_wizard_dragbutton_action_left">Kéo từ Trung tâm của nút sang bên trái để sử dụng Sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">Kéo từ Trung tâm của nút xuống dưới để sử dụng ^2</string>
+  <string name="cpp_wizard_dragbutton_action_up">Vuốt từ trung tâm của phím lên trên để dùng %</string>
+  <string name="cpp_wizard_dragbutton_action_left">Vuốt từ trung tâm của phím sang trái để dùng Sin</string>
+  <string name="cpp_wizard_dragbutton_action_down">Vuốt từ trung tâm của phím xuống để dùng ^2</string>
  <string name="cpp_wizard_welcome_title">Chào mừng</string>
  <string name="cpp_wizard_layout_title">Chọn bố trí</string>
  <string name="cpp_wizard_mode_title">Chọn chế độ</string>
+  <string name="cpp_wizard_theme_title">Chọn chủ đề</string>
  <string name="cpp_wizard_onscreen_calculator_title">Máy tính trong một cửa sổ riêng biệt</string>
-  <string name="cpp_wizard_dragbutton_title">Cách Kéo nút</string>
+  <string name="cpp_wizard_dragbutton_title">Vuốt phím cơ bản</string>
+  <string name="cpp_wizard_final_done">Các ứng dụng được thiết lập và sẵn sàng để sử dụng.</string>
  <string name="cpp_wizard_final_title">Hoàn tất!</string>
  <string name="cpp_wizard_final_free_and_opensource">Máy tính ++ là miễn phí và mã nguồn mở: tất cả các tính năng là miễn phí và mã nguồn có thể được tìm thấy trên github.</string>
  <string name="cpp_wizard_final_ways_to_help">Có rất nhiều cách làm thế nào bạn có thể giúp làm cho ứng dụng này tốt hơn:</string>
@ -30,7 +32,9 @@
  <string name="cpp_wizard_final_translate">Dịch</string>
  <string name="cpp_wizard_final_contribute">Đóng góp mã nguồn</string>
  <string name="cpp_wizard_onscreen_description">Các máy tính trong cửa sổ riêng biệt cho phép bạn làm tính toán trong khi sử dụng các ứng dụng khác trên thiết bị của bạn</string>
-  <string name="cpp_wizard_onscreen_checkbox">Sử máy tính trong cửa sổ riêng biệt (biểu tượng thứ hai sẽ xuất hiện trong danh sách ứng dụng)</string>
-  <string name="cpp_wizard_dragbutton_description">Kéo nút là một tính năng độc quyền của máy tính ++ cung cấp truy cập nhanh đến các chức năng thứ cấp</string>
+  <string name="cpp_wizard_onscreen_checkbox">Kích hoạt</string>
+  <string name="cpp_wizard_dragbutton_description">Vuốt phím là một tính năng độc đáo của riêng Máy tính++ giúp thao tác nhanh các tính năng khác trên cùng một phím bấm</string>
  <string name="cpp_wizard_finish_confirmation">Bạn có thực sự muốn đóng thuật sĩ?</string>
+  <string name="cpp_wizard_skip">Bỏ qua</string>
+  <string name="cpp_wizard_finish_confirmation_title">Hoàn tất?</string>
 </resources>
--- a/android-app/src/main/res/values-zh-rcn/text_strings.xml
+++ b/android-app/src/main/res/values-zh-rcn/text_strings.xml
@ -117,8 +117,6 @@
  <string name="c_calc_show_release_notes_summary">是否在应用升级之后显示更新日志</string>
  <string name="c_calc_use_back_button_as_prev_summary">设定返回键的行为</string>
  <string name="c_calc_use_back_button_as_prev_title">按返回键查看上一条记录</string>
-  <string name="c_clear_billing_info_summary">购买信息将从服务器重新加载</string>
-  <string name="c_clear_billing_info_title">更新购买信息</string>
  <string name="c_warning">警告</string>
  <string name="c_error">错误</string>
  <string name="c_billing_error">不支持付费： 你必须有谷歌结帐帐户链接到你的谷歌账户，且必须连接到互联网。</string>
--- a/android-app/src/main/res/values-zh-rcn/text_wizard.xml
+++ b/android-app/src/main/res/values-zh-rcn/text_wizard.xml
@ -4,8 +4,8 @@
 <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_finish">Done</string>
  <string name="cpp_wizard_layout_optimized">已优化</string>
  <string name="cpp_wizard_layout_big_buttons">大按钮</string>
  <string name="cpp_wizard_mode_simple">简单型</string>
@ -15,14 +15,16 @@
  <string name="cpp_restart_wizard">启动向导</string>
  <string name="cpp_wizard_dragbutton_action_end">就是这样！点击按钮来重启向导</string>
  <string name="cpp_wizard_dragbutton_action_center">点击下面的按钮输入9</string>
-  <string name="cpp_wizard_dragbutton_action_up">从按钮中间向上拖动输入%</string>
-  <string name="cpp_wizard_dragbutton_action_left">从按钮中间向左拖动输入sin</string>
-  <string name="cpp_wizard_dragbutton_action_down">从按钮中间向下拖动输入^2</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">欢迎</string>
  <string name="cpp_wizard_layout_title">选择布局</string>
  <string name="cpp_wizard_mode_title">选择模式</string>
+  <string name="cpp_wizard_theme_title">Choose theme</string>
  <string name="cpp_wizard_onscreen_calculator_title">在单独窗口中的计算器</string>
-  <string name="cpp_wizard_dragbutton_title">拖动按钮基本信息</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">快要完成了！</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ 是免费开源的：所有的功能都免费，并可以在github上找到源代码。</string>
  <string name="cpp_wizard_final_ways_to_help">有下面几种方法你可以帮助这款软件做的更好：</string>
@ -30,7 +32,11 @@
  <string name="cpp_wizard_final_translate">正在翻译</string>
  <string name="cpp_wizard_final_contribute">贡献源代码</string>
  <string name="cpp_wizard_onscreen_description">独立窗口模式的计算器可以让你在使用其他应用程序的同时进行计算。</string>
-  <string name="cpp_wizard_onscreen_checkbox">启用独立窗口模式的计算器（在应用程序列表中将出现第二个图标）</string>
-  <string name="cpp_wizard_dragbutton_description">拖动按钮是Calculator++的独创亮点，可以让你快速使用辅助功能。</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">你真的要结束向导吗？</string>
+  <string name="cpp_wizard_skip">Skip</string>
+  <string name="cpp_wizard_finish_confirmation_title">Finish?</string>
 </resources>
--- a/android-app/src/main/res/values-zh-rtw/text_about.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_about.xml
@ -3,7 +3,7 @@
 <!--Generated by crowdin.net-->
 <resources>
  <string name="c_about">關於</string>
-  <string name="c_about_content">版權所有 © 2009–2013\n\n<b>serso 又名 se.solovyev 製作</b>\n\n我們在Facebook 上：<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n此程式依據 Apache 2.0 授權條款發布：\n原始碼可以在這裡找到\n<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n更多資訊請\n以電子郵件聯繫作者\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n或造訪\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n 如果你想要支持這個計畫\n你可以在應用程式偏好選項中購買特別選項\n\n如果你喜歡這個應用程式\n將它評分為5顆星於\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n這個應用程式使用了以下開源庫:\n<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>	
+  <string name="c_about_content">版權所有 © 2009–2013\n\n<b>serso 又名 se.solovyev 製作</b>\n\n我們在Facebook 上：<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n此程式依據 Apache 2.0 授權條款發布：\n原始碼可以在這裡找到\n<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n更多資訊請\n以電子郵件聯繫作者\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n或造訪\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n 如果你想要支持這個計畫\n你可以在應用程式偏好選項中購買特別選項\n\n如果你喜歡這個應用程式\n將它評分為5顆星於\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n這個應用程式使用了以下開源庫：\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">翻譯這個應用程式成繁體中文:</string>
  <string name="cpp_translators_list">Ryan Rao\ntomyeh0510\nWeiHanWu</string>
--- a/android-app/src/main/res/values-zh-rtw/text_strings.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_strings.xml
@ -23,13 +23,10 @@
  <string name="c_calc_round_result_title">計算結果四捨五入</string>
  <string name="c_calc_round_result_summary">切換是否四捨五入計算結果</string>
  <string name="c_calc_science_notation_title">永遠使用科學記號</string>
-  <string name="c_calc_science_notation_summary">如果啟用，強制只用科學記號表示
-(12.34E-12)
-	</string>
+  <string name="c_calc_science_notation_summary">如果啟用，強制只用科學記號表示 (12.34E-12)</string>
  <string name="p_calc_result_precision_title">計算結果精確度</string>
  <string name="p_calc_max_calculation_time_title">最長計算時間</string>
-  <string name="p_calc_max_calculation_time_summary">如果計算超出指定時間 - 停止計算並顯示錯誤
-	</string>
+  <string name="p_calc_max_calculation_time_summary">如果計算超出指定時間 - 停止計算並顯示錯誤</string>
  <string name="c_exit">離開</string>
  <string name="c_cancel">取消</string>
  <string name="c_save">儲存</string>
@ -43,8 +40,7 @@
  <string name="c_var_description">描述</string>
  <string name="c_var_create_var">新增變數</string>
  <string name="c_var_edit_var">編輯變數</string>
-  <string name="c_value_is_not_a_number">數值必須是一個數目或留白：如果你有多個參數 - 新增一個函數來代替！
-	</string>
+  <string name="c_value_is_not_a_number">數值必須是一個數目或留白：如果你有多個參數 - 新增一個函數來代替！</string>
  <string name="c_var_name_clashes">變數名稱與函數名稱衝突！</string>
  <string name="c_var_already_exists">已經有相同名稱的變數存在！</string>
  <string name="c_name_is_not_valid">常數名稱無效：名稱必須以英文字母開頭，可以包含字母，數字及底線。
@ -70,9 +66,8 @@
  <string name="p_metro_green_theme">現代綠</string>
  <string name="p_metro_purple_theme">現代紫</string>
  <string name="p_material_theme">Material</string>
-  <string name="p_material_light_theme">Material Light</string>
-  <string name="c_calc_result_precision_summary">計算結果值的精確度（不論選項值為多少，所有計算過程都使用最大精確度）
-	</string>
+  <string name="p_material_light_theme">Material 淺色</string>
+  <string name="c_calc_result_precision_summary">計算結果值的精確度（不論選項值為多少，所有計算過程都使用最大精確度）</string>
  <string name="c_calc_color_display_summary">切換計算機編輯框顏色與樣式的渲染</string>
  <string name="c_calc_theme_summary">設定計算機的主題風格</string>
  <string name="c_toggle_datetime">顯示/隱藏日期</string>
@ -91,7 +86,7 @@
  <string name="c_calc_layout_summary">設定按鍵配置</string>
  <string name="c_calc_haptic_feedback_title">觸覺反饋</string>
  <string name="c_calc_haptic_feedback_summary">切換點擊按鍵時是否震動</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">關閉</string>
  <string name="p_calc_haptic_feedback_strength_short">短</string>
  <string name="p_calc_haptic_feedback_strength_middle">中</string>
  <string name="p_calc_haptic_feedback_strength_long">長</string>
@ -119,16 +114,12 @@
  <string name="c_copy_value">複製數值</string>
  <string name="c_first_start_text">感謝你選擇 Calculator++！\n\nCalculator++ 是強大的日常計算工具。</string>
  <string name="c_calc_show_release_notes_title">顯示發行紀錄</string>
-  <string name="c_calc_show_release_notes_summary">選擇是否在升級至新版本後跳出發行紀錄視窗
-	</string>
+  <string name="c_calc_show_release_notes_summary">選擇是否在更新至新版本後跳出發行紀錄視窗</string>
  <string name="c_calc_use_back_button_as_prev_summary">設定返回鍵的功能</string>
  <string name="c_calc_use_back_button_as_prev_title">使用返回鍵回到先前歷史紀錄</string>
-  <string name="c_clear_billing_info_summary">購買資訊將會從伺服器重新載入</string>
-  <string name="c_clear_billing_info_title">更新購買資訊</string>
  <string name="c_warning">警告</string>
  <string name="c_error">錯誤</string>
-  <string name="c_billing_error">不支援的結帳：你必須要有連結到 Google 帳號的 Google Checkout 帳號，而且必須連接網路。
-	</string>
+  <string name="c_billing_error">不支援的結帳：你必須要有連結到 Google 帳號的 Google Checkout 帳號，而且必須連接網路。</string>
  <string name="c_calc_ad_free_title">支持這個專案</string>
  <string name="c_calc_ad_free_summary">並且移除廣告</string>
  <string name="c_calc_already_purchased">去廣告選項已經購買！</string>
@ -136,8 +127,7 @@
 知道你對這個應用程式的意見對我們而言十分重要。\n\n
 請您評分 Calculator++\n於<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
-<a href="http://facebook.com/calculatorpp">Facebook</a>
-	</string>
+<a href="http://facebook.com/calculatorpp">Facebook</a></string>
  <string name="c_angle_units_changed_to">角度單位已改為 \'%s\'！</string>
  <string name="c_numeral_base_changed_to">進位制已改為 \'%s\'！</string>
  <string name="c_conversion_tool">轉換工具</string>
@ -162,28 +152,24 @@ Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
  <string name="c_function_parameters">參數</string>
  <string name="function_create_function">新增函數</string>
  <string name="function_edit_function">編輯函數</string>
-  <string name="function_name_is_not_valid">函數名稱無效：名稱必須以字母開頭，可以包含字母、數字和底線。
-	</string>
+  <string name="function_name_is_not_valid">函數名稱無效：名稱必須以字母開頭，可以包含字母、數字和底線。</string>
  <string name="function_already_exists">相同名稱的函數已經存在！</string>
  <string name="function_is_empty">函數主體不能空白！</string>
  <string name="function_param_not_empty">函數參數不應該是空白！</string>
  <string name="function_removal_confirmation_question">你真的要刪除函數 \'%s\' 嗎？</string>
  <string name="empty_function_error">無法新增空白函數！</string>
-  <string name="do_not_show_messages_in_session">不要顯示這訊息直到下次</string>
+  <string name="do_not_show_messages_in_session">直到下一次不要顯示這訊息</string>
  <string name="calculation_messages_dialog_title">Calculator++ 警告</string>
  <string name="ok">好</string>
  <string name="p_show_calculation_messages_dialog_title">在對話框中顯示計算訊息</string>
-  <string name="p_show_calculation_messages_dialog_summary">如果啟用，計算時任何訊息產生，將會顯示特別的對話框
-	</string>
+  <string name="p_show_calculation_messages_dialog_summary">如果啟用，計算時任何訊息產生，將會顯示特別的對話框</string>
  <string name="fix">修復</string>
  <string name="p_preferred_numeral_base_title">預設進位制</string>
  <string name="p_preferred_numeral_base_summary">選擇預設進位制</string>
-  <string name="preferred_numeral_base_message">目前的進位制 \'%2$s\' 與預設的 \'%1$s\' 不同。忘了改回來？
-	</string>
+  <string name="preferred_numeral_base_message">目前的進位制 \'%2$s\' 與預設的 \'%1$s\' 不同。忘了改回來？</string>
  <string name="p_preferred_angle_units_title">預設角度單位</string>
  <string name="p_preferred_angle_units_summary">選擇預設角度單位</string>
-  <string name="preferred_angle_units_message">目前的角度單位 \'%2$s\' 與預設的 \'%1$s\' 不同。忘了改回來？
-	</string>
+  <string name="preferred_angle_units_message">目前的角度單位 \'%2$s\' 與預設的 \'%1$s\' 不同。忘了改回來？</string>
  <string name="close">關閉</string>
  <string name="c_app_widget_3x3_name">Calculator++ 小工具（3x3）</string>
  <string name="c_app_widget_3x4_name">Calculator++ 小工具（3x4）</string>
@ -192,11 +178,9 @@ Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
  <string name="open_onscreen_calculator">點擊以視窗模式開啟計算機</string>
  <string name="prefs_onscreen_title">計算機（獨立視窗）設定</string>
  <string name="prefs_onscreen_start_on_boot_title">開機時啟動</string>
-  <string name="prefs_onscreen_start_on_boot_summary">如果啟用，Calculator++ 將會在裝置啟動後顯示在通知列
-	</string>
+  <string name="prefs_onscreen_start_on_boot_summary">如果啟用，Calculator++ 將會在裝置啟動後顯示在通知列</string>
  <string name="prefs_onscreen_show_app_icon_title">顯示獨立的圖示（需要重新啟動）</string>
-  <string name="prefs_onscreen_show_app_icon_summary">如果啟用，應用程式列表將會顯示第二個圖示
-	</string>
+  <string name="prefs_onscreen_show_app_icon_summary">如果啟用，應用程式列表將會顯示第二個圖示</string>
  <string name="cpp_this_change_may_require_reboot">這個變動可能需要重新啟動</string>
  <string name="cpp_plot_2d">2D 繪圖</string>
  <string name="cpp_plot_3d">3D 繪圖</string>
@ -212,8 +196,7 @@ Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
  <string name="cpp_plotter">函數繪圖工具</string>
  <string name="cpp_plot_screenshot">螢幕截圖</string>
  <string name="cpp_plot_screenshot_saved">成功儲存截圖：%1$s！</string>
-  <string name="cpp_plot_unable_to_save_screenshot">未掛載 SD 卡，無法儲存螢幕截圖。請掛載 SD 卡後再試一次！
-	</string>
+  <string name="cpp_plot_unable_to_save_screenshot">未掛載 SD 卡，無法儲存螢幕截圖。請掛載 SD 卡後再試一次！</string>
  <string name="cpp_plot_function_line_color_type">線條顏色類型</string>
  <string name="cpp_plot_function_line_color">線條顏色</string>
  <string name="cpp_plot_function_line_style">線條樣式</string>
@ -237,15 +220,14 @@ Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
  <string name="cpp_message">訊息</string>
  <string name="cpp_continue">繼續</string>
  <string name="cpp_purchase_text">支持這個專案簡單而安全：購買程序由 Google 提供，你只需要一個正確設定過的 Google 帳戶。\n\n
-付款資訊儲存於 Google 伺服器連同你的帳號，然後你可以輕易地在多個裝置上使用這個應用程式。\n\n
-點擊 \"繼續\" 按鍵，你會被導向至 Google Play 應用程式進行付款。
-	</string>
+付款資訊連同你的帳號儲存於 Google 伺服器，然後你可以輕易地在多個裝置上使用這個應用程式。\n\n
+點擊 \"繼續\" 按鍵，你會被導向至 Google Play 應用程式進行付款。</string>
  <string name="cpp_purchase_title">購買</string>
  <string name="cpp_var_show_greek_keyboard">顯示希臘字母</string>
  <string name="cpp_var_hide_greek_keyboard">隱藏希臘字母</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>
+  <string name="cpp_clear_history_title">清除歷史紀錄？</string>
+  <string name="cpp_clear_history_message">所有歷史紀錄將被清除。</string>
+  <string name="cpp_clear_history">清除</string>
+  <string name="cpp_new_in_version">%1$s 版本的新功能</string>
+  <string name="cpp_release_notes_choose_theme">你想要嘗試新的 Material 主題風格嗎？ 從清單中選擇：</string>
 </resources>
--- a/android-app/src/main/res/values-zh-rtw/text_vars.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_vars.xml
@ -2,19 +2,13 @@
 <!--Generated by crowdin.com-->
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_var_description_PI">圓周長與直徑的比值。注意：這個常數隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 180.0
-	</string>
-  <string name="c_var_description_pi">圓周長與直徑的比值。注意：這個常數不隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 3.14
-	</string>
-  <string name="c_var_description_e">唯一使函數 f(x) = e^x 的微分（切線斜率）在 x = 0 時的值為 1 的實數。
-	</string>
+  <string name="c_var_description_PI">圓周長與直徑的比值。注意：這個常數隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 180.0</string>
+  <string name="c_var_description_pi">圓周長與直徑的比值。注意：這個常數不隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 3.14</string>
+  <string name="c_var_description_e">唯一使函數 f(x) = e^x 的微分（切線斜率）在 x = 0 時的值為 1 的實數。</string>
  <string name="c_var_description_i">虛數單位，定義 i^2 = -1</string>
  <string name="c_var_description_c">真空中的光速，m/s</string>
-  <string name="c_var_description_G">萬有引力常數是一個觀察的物理常數，用來計算具有質量的物體間的引力，m^3·kg^−1·s^−2
-	</string>
-  <string name="c_var_description_h">量子力學中對應能量量子大小的物理常數，
-J·s
-	</string>
+  <string name="c_var_description_G">萬有引力常數是一個觀察的物理常數，用來計算具有質量的物體間的引力，m^3·kg^−1·s^−2</string>
+  <string name="c_var_description_h">量子力學中對應能量量子大小的物理常數，J·s</string>
  <string name="c_var_description_h_reduced">約化普朗克常數，J·s</string>
  <string name="c_var_description_nan">非數</string>
  <string name="c_var_description_inf">無窮大</string>
--- a/android-app/src/main/res/values-zh-rtw/text_wizard.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_wizard.xml
@ -4,16 +4,17 @@
 <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_finish">完成</string>
  <string name="cpp_wizard_layout_optimized">最佳化</string>
  <string name="cpp_wizard_layout_big_buttons">大型按鍵</string>
  <string name="cpp_wizard_mode_simple">簡單模式</string>
  <string name="cpp_wizard_mode_simple_description">在簡單模式下，主畫面上只有基本功能可以使用。
-計算結果四捨五入至小數第5位，角度單位預設為 Degrees。
+計算結果四捨五入，角度單位預設為 度(Degrees)。
 	</string>
  <string name="cpp_wizard_mode_engineer">工程模式</string>
-  <string name="cpp_wizard_mode_engineer_description">在工程模式下，主畫面上可以使用特別的功能。計算結果不四捨五入並以工程符號表示，角度單位預設為 Radians。
+  <string name="cpp_wizard_mode_engineer_description">在工程模式下，主畫面上可以使用特別的功能。
+計算結果不四捨五入並以工程符號表示，角度單位預設為 弧度(Radians)。
 	</string>
  <string name="cpp_restart_wizard">啟動精靈</string>
  <string name="cpp_wizard_dragbutton_action_end">非常好！再點擊一次按鍵來重試</string>
@ -24,8 +25,10 @@
  <string name="cpp_wizard_welcome_title">歡迎</string>
  <string name="cpp_wizard_layout_title">選擇版面配置</string>
  <string name="cpp_wizard_mode_title">選擇模式</string>
+  <string name="cpp_wizard_theme_title">選擇主題風格</string>
  <string name="cpp_wizard_onscreen_calculator_title">獨立視窗的計算機</string>
-  <string name="cpp_wizard_dragbutton_title">滑動按鍵基本操作</string>
+  <string name="cpp_wizard_dragbutton_title">滑動按鍵基礎教學</string>
+  <string name="cpp_wizard_final_done">這個應用程式設定完成並且準備好來使用。</string>
  <string name="cpp_wizard_final_title">快要完成了！</string>
  <string name="cpp_wizard_final_free_and_opensource">Calculator++ 是免費且開源的：所有功能都是免费的，而且可以在 github 上找到原始碼。
 	</string>
@ -36,9 +39,10 @@
  <string name="cpp_wizard_final_contribute">貢獻原始碼</string>
  <string name="cpp_wizard_onscreen_description">獨立視窗的計算機讓你在使用其他應用程式時能夠同時計算。
 	</string>
-  <string name="cpp_wizard_onscreen_checkbox">啟用獨立視窗的計算機（第二個圖示將會出現在應用程式列表）
-	</string>
+  <string name="cpp_wizard_onscreen_checkbox">啟用</string>
  <string name="cpp_wizard_dragbutton_description">滑動按鍵是 Calculator++ 的獨家特色，提供次要功能的快速途徑
 	</string>
  <string name="cpp_wizard_finish_confirmation">你真的想要結束精靈嗎？</string>
+  <string name="cpp_wizard_skip">略過</string>
+  <string name="cpp_wizard_finish_confirmation_title">完成？</string>
 </resources>
--- a/android-app/src/main/res/values/text_release_notes.xml
+++ b/android-app/src/main/res/values/text_release_notes.xml
@ -305,4 +305,12 @@
 		6. Other fixes
 	</string>

+	<string name="c_release_notes_for_141_version" translatable="false">2.1.2</string>
+	<string name="c_release_notes_for_141">
+		★ Improved button gesture detection\n
+		★ Fast text removal by long pressing "Erase" button\n
+		★ "Equals" button now copies result to the editor\n
+		★ Various bugfixes, stability and usability improvements
+	</string>
+
 </resources>
--- a/android-app/src/main/res/values/text_wizard.xml
+++ b/android-app/src/main/res/values/text_wizard.xml
@ -1,51 +1,53 @@
-<?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_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_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_skip">Skip</string>
-	<string name="cpp_wizard_finish_confirmation_title">Finish?</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>
--- a/android-app/src/main/res/xml/calculator_widget.xml
+++ b/android-app/src/main/res/xml/calculator_widget.xml
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
+					xmlns:tools="http://schemas.android.com/tools"
+					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
+					a:previewImage="@drawable/widget_preview"
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
--- a/android-app/src/main/res/xml/calculator_widget_info.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
+					xmlns:tools="http://schemas.android.com/tools"
+					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="180dp"
+					a:minWidth="180dp"
+					a:previewImage="@drawable/widget_preview"
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
--- a/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_3x3.xml
@ -23,12 +23,10 @@
  -->

 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="180dp"
-					a:minHeight="180dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="180dp"
+					a:minWidth="180dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
--- a/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_3x4.xml
@ -23,12 +23,10 @@
  -->

 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="180dp"
-					a:minHeight="250dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minWidth="180dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
--- a/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_4x4.xml
@ -23,12 +23,14 @@
  -->

 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="250dp"
-					a:minHeight="250dp"
-					a:initialLayout="@layout/widget_layout"
+					xmlns:tools="http://schemas.android.com/tools"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="250dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"
+					tools:ignore="UnusedAttribute"/>
--- a/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
+++ b/android-app/src/main/res/xml/calculator_widget_info_4x5.xml
@ -23,12 +23,12 @@
  -->

 <appwidget-provider xmlns:a="http://schemas.android.com/apk/res/android"
-					a:minWidth="250dp"
-					a:minHeight="320dp"
-					a:initialLayout="@layout/widget_layout"
 					a:initialKeyguardLayout="@layout/widget_layout_lockscreen"
-					a:widgetCategory="home_screen|keyguard"
+					a:initialLayout="@layout/widget_layout"
+					a:minHeight="320dp"
+					a:minResizeHeight="180dp"
+					a:minResizeWidth="180dp"
+					a:minWidth="250dp"
 					a:previewImage="@drawable/widget_preview"
-					a:resizeMode="horizontal|vertical">
-
-</appwidget-provider>
+					a:resizeMode="horizontal|vertical"
+					a:widgetCategory="home_screen|keyguard"/>
--- a/build.gradle
+++ b/build.gradle
@ -1,5 +1,5 @@
 public int version_code() {
-  return 140
+  return 141
 }

 public String version_name() {