Lint issues

2016-03-27 13:35:42 +02:00 · 2016-03-27 13:35:42 +02:00 · 259ec5a77f
commit 259ec5a77f
parent 30877e1337
75 changed files with 35 additions and 608 deletions
--- a/app/src/main/java/org/solovyev/android/calculator/plot/PlotDimensionsFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/plot/PlotDimensionsFragment.java
@ -144,7 +144,7 @@ public class PlotDimensionsFragment extends BaseDialogFragment

    @Override
    protected void onPrepareDialog(@NonNull AlertDialog.Builder builder) {
-        builder.setTitle("Dimensions");
+        builder.setTitle(R.string.cpp_plot_range);
        builder.setPositiveButton(R.string.cpp_done, null);
    }

--- a/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
@ -135,7 +135,7 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
            }

            final AlertDialog.Builder b = new AlertDialog.Builder(this, App.getTheme().alertDialogTheme);
-            b.setTitle(getString(R.string.cpp_wizard_finish_confirmation_title)).
+            b.setTitle(R.string.cpp_wizard_finish_confirmation_title).
                    setMessage(R.string.cpp_wizard_finish_confirmation).
                    setNegativeButton(R.string.c_no, dialogListener).
                    setPositiveButton(R.string.c_yes, dialogListener).
--- a/app/src/main/res/drawable-xxhdpi/logo_wizard.png
+++ b/app/src/main/res/drawable-xxhdpi/logo_wizard.png
--- a/app/src/main/res/drawable-xxhdpi/logo_wizard_light.png
+++ b/app/src/main/res/drawable-xxhdpi/logo_wizard_light.png
--- a/app/src/main/res/drawable-xxhdpi/logo_wizard_window.png
+++ b/app/src/main/res/drawable-xxhdpi/logo_wizard_window.png
--- a/app/src/main/res/drawable-xxhdpi/logo_wizard_window_light.png
+++ b/app/src/main/res/drawable-xxhdpi/logo_wizard_window_light.png
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@ -21,7 +21,7 @@
  ~ Email: se.solovyev@gmail.com
  ~ Site:  http://se.solovyev.org
  -->
-<LinearLayout
+<LinearLayout xmlns:tools="http://schemas.android.com/tools"
    a:id="@+id/main"
    style="@style/CppMain"
    xmlns:a="http://schemas.android.com/apk/res/android"
@ -41,7 +41,8 @@
            layout="@layout/cpp_app_button_equals_no_bg"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <FrameLayout
            a:id="@+id/display"
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@ -22,7 +22,7 @@
  ~ Site:  http://se.solovyev.org
  -->

-<LinearLayout
+<LinearLayout xmlns:tools="http://schemas.android.com/tools"
    a:id="@+id/main"
    style="@style/CppMain"
    xmlns:a="http://schemas.android.com/apk/res/android"
@ -43,7 +43,8 @@
            layout="@layout/cpp_app_button_equals_no_bg"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <FrameLayout
            a:id="@+id/display"
--- a/app/src/main/res/layout/cpp_wizard_step_drag_button.xml
+++ b/app/src/main/res/layout/cpp_wizard_step_drag_button.xml
@ -54,6 +54,6 @@
        a:text="9"
        c:directionTextDown="^2"
        c:directionTextUp="%"
-        tools:ignore="HardcodedText" />
+        tools:ignore="HardcodedText,InefficientWeight" />

 </LinearLayout>
--- a/app/src/main/res/layout/onscreen_layout.xml
+++ b/app/src/main/res/layout/onscreen_layout.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Onscreen"
    a:orientation="vertical">

@ -29,7 +30,8 @@
                layout="@layout/cpp_simple_button_equals"
                a:layout_width="0dp"
                a:layout_height="match_parent"
-                a:layout_weight="1" />
+                a:layout_weight="1"
+                tools:ignore="NestedWeights" />

            <include
                layout="@layout/onscreen_display"
--- a/app/src/main/res/layout/onscreen_layout_material.xml
+++ b/app/src/main/res/layout/onscreen_layout_material.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Onscreen"
    a:orientation="vertical">

@ -30,7 +31,8 @@
                layout="@layout/cpp_simple_button_equals_material"
                a:layout_width="0dp"
                a:layout_height="match_parent"
-                a:layout_weight="1" />
+                a:layout_weight="1"
+                tools:ignore="NestedWeights" />

            <include
                layout="@layout/onscreen_display"
--- a/app/src/main/res/layout/onscreen_layout_material_light.xml
+++ b/app/src/main/res/layout/onscreen_layout_material_light.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Onscreen.Light"
    a:orientation="vertical">

@ -29,7 +30,8 @@
                layout="@layout/cpp_simple_button_equals_material_light"
                a:layout_width="0dp"
                a:layout_height="match_parent"
-                a:layout_weight="1" />
+                a:layout_weight="1"
+                tools:ignore="NestedWeights" />

            <include
                layout="@layout/onscreen_display_light"
--- a/app/src/main/res/layout/widget_layout.xml
+++ b/app/src/main/res/layout/widget_layout.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Widget"
    a:layout_width="match_parent"
    a:layout_height="match_parent"
@ -23,7 +24,8 @@
            layout="@layout/cpp_simple_button_equals"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <include
            layout="@layout/widget_display"
--- a/app/src/main/res/layout/widget_layout_lockscreen.xml
+++ b/app/src/main/res/layout/widget_layout_lockscreen.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Widget"
    a:layout_width="match_parent"
    a:layout_height="match_parent"
@ -23,7 +24,8 @@
            layout="@layout/cpp_simple_button_equals"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <include
            layout="@layout/widget_display"
--- a/app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
+++ b/app/src/main/res/layout/widget_layout_lockscreen_collapsed.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Widget"
    a:layout_width="match_parent"
    a:layout_height="match_parent"
@ -22,7 +23,8 @@
            a:layout_width="0dp"
            a:layout_weight="3"
            a:gravity="center_vertical|left"
-            a:textSize="@dimen/cpp_widget_editor_text_size_collapsed" />
+            a:textSize="@dimen/cpp_widget_editor_text_size_collapsed"
+            tools:ignore="NestedWeights" />

        <include
            layout="@layout/cpp_simple_button_equals"
--- a/app/src/main/res/layout/widget_layout_material.xml
+++ b/app/src/main/res/layout/widget_layout_material.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Widget"
    a:layout_width="match_parent"
    a:layout_height="match_parent"
@ -23,7 +24,8 @@
            layout="@layout/cpp_simple_button_equals_material"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <include
            layout="@layout/widget_display"
--- a/app/src/main/res/layout/widget_layout_material_light.xml
+++ b/app/src/main/res/layout/widget_layout_material_light.xml
@ -2,6 +2,7 @@

 <LinearLayout
    xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    style="@style/CppMain.Widget.Light"
    a:layout_width="match_parent"
    a:layout_height="match_parent"
@ -23,7 +24,8 @@
            layout="@layout/cpp_simple_button_equals_material_light"
            a:layout_width="0dp"
            a:layout_height="match_parent"
-            a:layout_weight="1" />
+            a:layout_weight="1"
+            tools:ignore="NestedWeights" />

        <include
            layout="@layout/widget_display_light"
--- a/app/src/main/res/values-ar/text_strings.xml
+++ b/app/src/main/res/values-ar/text_strings.xml
@ -55,8 +55,6 @@
    <string name="p_grouping_separator_space">مسافة ( )</string>
    <string name="c_calc_grouping_separator">فاصل المجومعات العددية</string>
    <string name="c_calc_grouping_separator_summary">تعيين فاصل المجموعات</string>
-    <string name="p_layout_calculator">علمية</string>
-    <string name="p_layout_simple">بسيطة</string>
    <string name="not_valid_result">النتيجة الحالية غير صالحة!</string>
    <string name="c_use">استخدم</string>
    <string name="c_copy_expression">نسخ المعادلة</string>
@ -99,39 +97,21 @@
    <string name="open_onscreen_calculator">أنقر لفتح الآلة الحاسبة في وضع النافذة</string>
    <string name="prefs_onscreen_title">إعدادات الآلة الحاسبة (في نافذة منفصلة)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">بدء بعد إعادة التشغيل</string>
-    <string name="prefs_onscreen_start_on_boot_summary">إذا كان الخيار فعال ستظهر الآلة الحاسبة في شريط الإعلام بعد تشغيل الجهاز</string>
    <string name="prefs_onscreen_show_app_icon_title">إظهار أيقونة منفصلة (يتطلب إعادة التشغيل)</string>
    <string name="prefs_onscreen_show_app_icon_summary">إذا كان الخيار فعال ستظهر الأيقونة الثانية في قائمة التطبيقات</string>
    <string name="cpp_this_change_may_require_reboot">قد يتطلب هذا التغيير إعادة تشغيل</string>
    <string name="cpp_plotter">رسّام الدوال</string>
    <string name="cpp_plot_function_line_color">لون الخط</string>
-    <string name="cpp_plot_function_line_style">شكل الخط</string>
    <string name="cpp_plot_function_line_width">عرض الخط</string>
-    <string name="cpp_plot_function_settings">إعدادات الدالّة</string>
-    <string name="cpp_function">الدالّة</string>
-    <string name="cpp_pinned">مثببت</string>
-    <string name="cpp_visible">مرئي</string>
    <string name="cpp_plot_button_text">+رسم</string>
    <string name="cpp_plot_empty_function_error">غير قادر على رسم دالّة فارغة!</string>
    <string name="cpp_plot_too_many_variables">غير قادر على رسم: متغيرات كثيرة جداً!</string>
    <string name="cpp_plot_range">نطاق الرسم البياني</string>
-    <string name="cpp_fullscreen">شاشة ممتلئة</string>
-    <string name="cpp_plot_range_x_min">الحد الأدنى للـ X</string>
-    <string name="cpp_plot_range_x_max">الحد الأقصى للـ X</string>
-    <string name="cpp_plot_range_y_min">الحد الأدنى للـ Y</string>
-    <string name="cpp_plot_range_y_max">الحد الأقصى للـ Y</string>
-    <string name="cpp_invalid_number">عدد غير صالح!</string>
-    <string name="cpp_plot_boundaries_should_differ">يجب أن لا تكون حدود الرسم البياني نفسها!</string>
-    <string name="cpp_apply">تنفيذ</string>
-    <string name="cpp_message">رسالة</string>
    <string name="cpp_continue">متابعة</string>
  <string name="cpp_purchase_text">دعم المشروع سهل و آمن: عملية الشراء يتم توفيرها من قبل غوغل, وكل ما عليك هو حساب غوغل مكون بشكل صحيح.\n\n
 تفاصيل الدفع مخزنة في خوادم غوغل مع حساب غوغل الخاص بك و يمكنك بسهولة استخدام هذا التطبيق على عدة أجهزة.\n\n
 عند النقر فوق زر \'متابعة\' سيتم إعادة توجيهك إلى التطبيق سوق غوغل لتقوم بالدفع.</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">مسح المحفوظات؟</string>
    <string name="cpp_clear_history_message">سيتم مسح كل التاريخ.</string>
    <string name="cpp_clear_history">إزالة</string>
--- a/app/src/main/res/values-ar/text_vars.xml
+++ b/app/src/main/res/values-ar/text_vars.xml
@ -6,7 +6,6 @@
    <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_h_reduced">انخفاض ثابت بلانك, J·s</string>
    <string name="c_var_description_nan">ليس رقماً</string>
    <string name="c_var_description_inf">لا نهاية</string>
--- a/app/src/main/res/values-ar/text_wizard.xml
+++ b/app/src/main/res/values-ar/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
  <string name="cpp_wizard_mode_simple_description">في النمط البسيط ستتوفر الوظائف الأساسية فقط في الشاشة الرئيسية.
 يتم تقريب النتيجة الى 5 أرقام كحد أقصى, وتستخدم الدرجات كوحدات إفتراضية للزاوية.</string>
@ -16,21 +14,14 @@
    <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">امسح من مركز الزر الى الاسفل لاستخدام التربيع</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_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>
-    <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">الآلة الحاسبة ذات النافذة المنفصلة تسمح لك بالقيام بعمليات حسابية أثناء استخدام تطبيقات أخرى على جهازك</string>
    <string name="cpp_wizard_onscreen_checkbox">تمكين</string>
    <string name="cpp_wizard_dragbutton_description">السحب على الزر هي ميزة حصرية في هذه الآلة الحاسبة++ اللتي بدورها توفر الوصول السريع إلى وظائف الثانوي</string>
--- a/app/src/main/res/values-cs/text_strings.xml
+++ b/app/src/main/res/values-cs/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Mezera ( )</string>
    <string name="c_calc_grouping_separator">Oddělovač skupiny čísel</string>
    <string name="c_calc_grouping_separator_summary">Nastavit oddělovač skupiny čísel</string>
-    <string name="p_layout_calculator">Vědecké</string>
-    <string name="p_layout_simple">Jednoduché</string>
    <string name="not_valid_result">Aktuální výsledek není platný!</string>
    <string name="c_use">Použít</string>
    <string name="c_copy_expression">Kopírovat výraz</string>
@ -98,38 +96,20 @@
    <string name="open_onscreen_calculator">Kliknutím spustíte kalkulačku v režimu okna</string>
    <string name="prefs_onscreen_title">Nastavení kalkulačky (v samostatném okně)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Spustit při startu operačního systému</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Je-li zapnuta Kalkulačka ++, budou se objevovat oznámení v oznamovací oblasti</string>
    <string name="prefs_onscreen_show_app_icon_title">Zobrazit samostatnou ikonu (vyžaduje restartování)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Je-li zapnuta druhá ikona  bude zobrazena v seznamu aplikací</string>
    <string name="cpp_this_change_may_require_reboot">Tato změna může vyžadovat restartování systému</string>
    <string name="cpp_plotter">Funkce vykreslování</string>
    <string name="cpp_plot_function_line_color">Barva čáry</string>
-    <string name="cpp_plot_function_line_style">Styl čáry</string>
    <string name="cpp_plot_function_line_width">Tloušťka čáry</string>
-    <string name="cpp_plot_function_settings">Nastavení funkcí</string>
-    <string name="cpp_function">Funkce</string>
-    <string name="cpp_pinned">Přichyceno</string>
-    <string name="cpp_visible">Viditelný</string>
    <string name="cpp_plot_button_text">+ Mřížka</string>
    <string name="cpp_plot_empty_function_error">Nelze vykreslit prázdnou funkci!</string>
    <string name="cpp_plot_too_many_variables">Nelze vykreslit: příliš mnoho proměnných!</string>
    <string name="cpp_plot_range">Oblast grafu</string>
-    <string name="cpp_fullscreen">Celá obrazovka</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">Neplatné číslo!</string>
-    <string name="cpp_plot_boundaries_should_differ">Hranice grafu by neměly být stejné!</string>
-    <string name="cpp_apply">Použít</string>
-    <string name="cpp_message">Zpráva</string>
    <string name="cpp_continue">Pokračovat</string>
  <string name="cpp_purchase_text">Podpora projektu je snadná a bezpečná: nákup poskytuje společnost Google a vše co potřebujete je správně nakonfigurovaný Google účet.\n\n
 Platební informace jsou uloženy na serveru společně s vaším účtem.\n\n Klepnutím na tlačítko \"Pokračovat\", budete přesměrování do aplikace Google Play, kde uskutečníte vaši platbu.</string>
    <string name="cpp_purchase_title">Zakoupit</string>
-    <string name="cpp_var_show_greek_keyboard">Zobrazit řecká písmena</string>
-    <string name="cpp_var_hide_greek_keyboard">Skrýt řecká písmena</string>
    <string name="cpp_clear_history_title">Vymazat historii ?</string>
    <string name="cpp_clear_history_message">Celá historie bude vymazána.</string>
    <string name="cpp_clear_history">Vymazat</string>
--- a/app/src/main/res/values-cs/text_vars.xml
+++ b/app/src/main/res/values-cs/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Imaginární jednotka, je definovaná jako: i² = −1</string>
    <string name="c_var_description_c">Rychlost světla ve vakuu, m/s</string>
    <string name="c_var_description_G">Gravitační konstanta je konstanta úměrnosti v Newtonově gravitačním zákoně mezi gravitační silou a součinem hmotností interagujících těles děleným kvadrátem jejich vzdálenosti, m^3·kg^−1·s^−2</string>
-    <string name="c_var_description_h">Planckova konstanta h je jedna ze základních fyzikálních konstant. Jako fyzikální veličina má rozměr momentu hybnosti nebo akce, J·s</string>
    <string name="c_var_description_h_reduced">Redukovaná Planckova konstanta, J·s</string>
    <string name="c_var_description_nan">Není číslo</string>
    <string name="c_var_description_inf">Nekonečno</string>
--- a/app/src/main/res/values-cs/text_wizard.xml
+++ b/app/src/main/res/values-cs/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Zpět</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>
    <string name="cpp_wizard_mode_simple_description">V jednoduchém režimu budou z hlavní obrazovky k dispozici pouze základní funkce.   Výsledek se zaokrouhlí na 5 číslic, stupně se používají jako výchozí jednotka úhle.</string>
    <string name="cpp_wizard_mode_engineer">Vědec</string>
@ -14,21 +12,14 @@
    <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">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">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>
-    <string name="cpp_wizard_final_donate">Darování peněz</string>
-    <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</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>
--- a/app/src/main/res/values-de/text_strings.xml
+++ b/app/src/main/res/values-de/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Leerzeichen ( )</string>
    <string name="c_calc_grouping_separator">1000er-Trennzeichen</string>
    <string name="c_calc_grouping_separator_summary">1000er-Trennzeichen setzen</string>
-    <string name="p_layout_calculator">Wissenschaftlich</string>
-    <string name="p_layout_simple">Einfach</string>
    <string name="not_valid_result">Aktuelles Ergebnis ist ungültig!</string>
    <string name="c_use">Verwendung</string>
    <string name="c_copy_expression">Ausdruck kopieren</string>
@ -98,39 +96,21 @@
    <string name="open_onscreen_calculator">Klicken Sie hier, um den Rechner im Fenstermodus zu öffnen</string>
    <string name="prefs_onscreen_title">Fenstermodus-Einstellungen</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Beim Einschalten des Geräts starten</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Wenn aktiviert wird Calculator++ in der Benachrichtigungsleiste nach dem Gerätestart erscheinen</string>
    <string name="prefs_onscreen_show_app_icon_title">Seperates Symbol anzeigen (Neustart erforderlich)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Wenn aktiviert wird das zweite Symbol in der Anwendungsliste angezeigt</string>
    <string name="cpp_this_change_may_require_reboot">Diese Änderung kann einen Neustart erfordern</string>
    <string name="cpp_plotter">Funktionszeichner</string>
    <string name="cpp_plot_function_line_color">Linienfarbe</string>
-    <string name="cpp_plot_function_line_style">Linienart</string>
    <string name="cpp_plot_function_line_width">Linienbreite</string>
-    <string name="cpp_plot_function_settings">Funktionseinstellungen</string>
-    <string name="cpp_function">Funktion</string>
-    <string name="cpp_pinned">Fixiert</string>
-    <string name="cpp_visible">Sichtbar</string>
    <string name="cpp_plot_button_text">+plot</string>
    <string name="cpp_plot_empty_function_error">Eine leere Funktion kann nicht gezeichnet werden!</string>
    <string name="cpp_plot_too_many_variables">Die Funktion kann nicht gezeichnet werden: zu viele Variablen!</string>
    <string name="cpp_plot_range">Graphwertebereich</string>
-    <string name="cpp_fullscreen">Vollbildschirm</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">Ungültige Zahl!</string>
-    <string name="cpp_plot_boundaries_should_differ">Graph-Grenzen sollten nicht identisch sein!</string>
-    <string name="cpp_apply">Anwenden</string>
-    <string name="cpp_message">Nachricht</string>
    <string name="cpp_continue">Weiter</string>
  <string name="cpp_purchase_text">Unterstützen Sie das Projekts einfach und sicher: Der Kaufvorgang wird von Google zur Verfügung gestellt und alles was Sie dazu brauchen, ist ein Google Account.\n\n
 Die Zahlungsinformation wird mit Ihrem Google-Konto verknüpft und Sie können die Anwendung auf allen ihren Geräten installieren.\n\n 
 Klicken Sie auf \"Weiter\" und Sie werden zu Google Play weitergeleitet, wo Sie bezahlen.</string>
    <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">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>
--- a/app/src/main/res/values-de/text_vars.xml
+++ b/app/src/main/res/values-de/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Imaginäre Zahl, definiert durch i ^ 2 = -1</string>
    <string name="c_var_description_c">Lichtgeschwindigkeit im Vakuum, m·s^-1</string>
    <string name="c_var_description_G">Die Gravitationskonstante ist eine empirische physikalische Konstante, welche bei der Berechnung der Massenanziehung zwischen Objekten mit Masse benötigt wird, m^3·kg^−1·s^−2</string>
-    <string name="c_var_description_h">Das Plancksche Wirkungsquantum verknüpft die Frequenz einer elektromagnetischen Welle mit ihrer Energie, J·s</string>
    <string name="c_var_description_h_reduced">reduziertes Plancksches Wirkungsquantum, auch Dirac\'sche Konstante, J·s</string>
    <string name="c_var_description_nan">Keine Zahl</string>
    <string name="c_var_description_inf">Unendlich</string>
--- a/app/src/main/res/values-de/text_wizard.xml
+++ b/app/src/main/res/values-de/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Zurück</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>
  <string name="cpp_wizard_mode_simple_description">Im einfachen Modus werden nur grundlegende Funktionen vom Hauptbildschirm verfügbar sein.
 Das Ergebnis wird auf 5 Nachkommastellen gerundet. Grad wird als Winkeleinheit verwendet.</string>
@ -16,22 +14,14 @@ Ergebnisse werden nicht gerundet und es wird die wissenschaftliche Notation verw
    <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">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">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>
-    <string name="cpp_wizard_final_ways_to_help">Es gibt einige Möglichkeiten, wie Sie helfen können, diese Anwendung zu verbessern:</string>
-    <string name="cpp_wizard_final_donate">Geld spenden</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">Einschalten</string>
    <string name="cpp_wizard_dragbutton_description">Die Wischfunktion ist eine Besonderheit von Calculator++ um Tasten mehrfach zu belegen</string>
--- a/app/src/main/res/values-es/text_strings.xml
+++ b/app/src/main/res/values-es/text_strings.xml
@ -57,8 +57,6 @@
    <string name="p_grouping_separator_space">Espacio ( )</string>
    <string name="c_calc_grouping_separator">Separador de Grupos</string>
    <string name="c_calc_grouping_separator_summary">Establecer el separador de Grupos</string>
-    <string name="p_layout_calculator">Calculadora</string>
-    <string name="p_layout_simple">Sencilla</string>
    <string name="not_valid_result">El resultado actual no es válido!</string>
    <string name="c_use">Utilizar</string>
    <string name="c_copy_expression">Copia de la expresión</string>
@ -102,37 +100,19 @@
    <string name="open_onscreen_calculator">Haga clic para abrir la calculadora en modo ventana</string>
    <string name="prefs_onscreen_title">Ajustes de la calculadora (en ventana separada)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Iniciar al arrancar</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Si está activado, Calculadora++ aparecerá en la barra de notificaciones tras el arranque del sistema</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar icono separado (requiere reiniciar)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Si está activado, aparecerá un segundo icono en la lista de aplicaciones</string>
    <string name="cpp_this_change_may_require_reboot">Después de realizar este cambio, es posible que tenga que reiniciar</string>
    <string name="cpp_plotter">Trazador de funciones</string>
    <string name="cpp_plot_function_line_color">Color de línea</string>
-    <string name="cpp_plot_function_line_style">Estilo de línea</string>
    <string name="cpp_plot_function_line_width">Ancho de línea</string>
-    <string name="cpp_plot_function_settings">Ajustes de la función</string>
-    <string name="cpp_function">Función</string>
-    <string name="cpp_pinned">Anclado</string>
-    <string name="cpp_visible">Visible</string>
    <string name="cpp_plot_button_text">+trazar</string>
    <string name="cpp_plot_empty_function_error">¡No se puede trazar una función vacía!</string>
    <string name="cpp_plot_too_many_variables">¡Imposible trazar: demasiadas variables!</string>
    <string name="cpp_plot_range">Intervalo gráfico</string>
-    <string name="cpp_fullscreen">Pantalla completa</string>
-    <string name="cpp_plot_range_x_min">X Mín.</string>
-    <string name="cpp_plot_range_x_max">X Máx.</string>
-    <string name="cpp_plot_range_y_min">Y Mín.</string>
-    <string name="cpp_plot_range_y_max">Y Máx.</string>
-    <string name="cpp_invalid_number">¡Número no válido!</string>
-    <string name="cpp_plot_boundaries_should_differ">¡Los límites del gráfico no deben ser idénticos!</string>
-    <string name="cpp_apply">Aplicar</string>
-    <string name="cpp_message">Mensaje</string>
    <string name="cpp_continue">Continuar</string>
    <string name="cpp_purchase_text">Apoyar el proyecto es fácil y seguro: Google proporciona el proceso de compra y todo lo que necesitas es una cuenta de Google correctamente configurada.\n\n La información de pago se almacena en los servidores de Google con tu cuenta de Google, y puedes utilizar esta aplicación en varios dispositivos de manera sencilla.\n\n Al pulsar el botón \'Continuar\', se le redireccionará a Google Play para hacer el pago.</string>
    <string name="cpp_purchase_title">Comprar</string>
-    <string name="cpp_var_show_greek_keyboard">letras griegas</string>
-    <string name="cpp_var_hide_greek_keyboard">ocultar letras griegas</string>
    <string name="cpp_clear_history_title">¿Limpiar historial?</string>
    <string name="cpp_clear_history_message">Todo el historial será limpiado.</string>
    <string name="cpp_clear_history">Limpiar</string>
--- a/app/src/main/res/values-es/text_vars.xml
+++ b/app/src/main/res/values-es/text_vars.xml
@ -12,8 +12,6 @@
  <string name="c_var_description_G">La constante gravitatoria es una constante física empírica implicada en el
 cálculo de la atracción gravitatoria entre objetos con masa, m^3·kg^−1·s^−2
 	</string>
-  <string name="c_var_description_h">Constante física que refleja los tamaños de energía cuántica en mecánica cuántica, J·s
-	</string>
    <string name="c_var_description_h_reduced">Constante de Planck reducida, J·s</string>
    <string name="c_var_description_nan">No es un número</string>
    <string name="c_var_description_inf">Infinito</string>
--- a/app/src/main/res/values-es/text_wizard.xml
+++ b/app/src/main/res/values-es/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Atrás</string>
    <string name="cpp_wizard_start">Iniciar el asistente</string>
    <string name="cpp_wizard_finish">Terminado</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>
  <string name="cpp_wizard_mode_simple_description">En el modo sencillo sólo estará disponible la funcionalidad básica desde la pantalla principal.
 El resultado se redondea hasta 5 dígitos, y los grados son la unidad de ángulo predeterminada.</string>
@ -16,21 +14,14 @@ El resultado no se redondea, y los radianes son la unidad de ángulo predetermin
    <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">Deslice desde el centro del botón hacia arriba para usar %</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_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">Elegir tema</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_final_done">La aplicación está configurada y lista para usar.</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>
-    <string name="cpp_wizard_final_donate">Realizando una donación económica</string>
-    <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">Habilitar</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>
--- a/app/src/main/res/values-fi/text_strings.xml
+++ b/app/src/main/res/values-fi/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Väli ( )</string>
    <string name="c_calc_grouping_separator">Ryhmittely erotin</string>
    <string name="c_calc_grouping_separator_summary">Määrittää ryhmittelyn erotin</string>
-    <string name="p_layout_calculator">Tieteellinen</string>
-    <string name="p_layout_simple">Yksinkertainen</string>
    <string name="not_valid_result">Nykyinen tulos ei kelpaa!</string>
    <string name="c_use">Käyttö</string>
    <string name="c_copy_expression">Kopioi lauseke</string>
@ -98,37 +96,19 @@
    <string name="open_onscreen_calculator">Avaa Laskin kotona Akkuna moodi</string>
    <string name="prefs_onscreen_title">Laskin (uudessa ikkunassa) asetukset</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Alku model after etu</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Jos käytössä Laskin ++ näkyy ilmoituspalkki laitteen käynnistyksen jälkeen  </string>
    <string name="prefs_onscreen_show_app_icon_title">Näytä erillinen kuvake (vaatii uudelleenkäynnistyksen)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Jos päällä toinen kuvake näkyvät sovellusten luettelo  </string>
    <string name="cpp_this_change_may_require_reboot">Tämä muutos saattaa edellyttää uudelleenkäynnistyksen</string>
    <string name="cpp_plotter">Tehtävä piirturit</string>
    <string name="cpp_plot_function_line_color">Viivan väri</string>
-    <string name="cpp_plot_function_line_style">Viivan tyyli</string>
    <string name="cpp_plot_function_line_width">Viivan leveys</string>
-    <string name="cpp_plot_function_settings">Asetukset</string>
-    <string name="cpp_function">Toiminto</string>
-    <string name="cpp_pinned">Kiinnitetty</string>
-    <string name="cpp_visible">Näkyvä</string>
    <string name="cpp_plot_button_text">+alue</string>
    <string name="cpp_plot_empty_function_error">Tontti tyhjä toiminto ei onnistunut.</string>
    <string name="cpp_plot_too_many_variables">Ei voi piirtää: liian monta muuttujaa!</string>
    <string name="cpp_plot_range">Kuva-alue</string>
-    <string name="cpp_fullscreen">Koko näyttö</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">Virheellinen numero!</string>
-    <string name="cpp_plot_boundaries_should_differ">Kaavion rajat pitäisi olla sama!</string>
-    <string name="cpp_apply">Hyväksy</string>
-    <string name="cpp_message">Viesti</string>
    <string name="cpp_continue">Jatka</string>
    <string name="cpp_purchase_text">Menossa mukana on helppoa ja turvallista: ostoprosessi on Googlen tarjoama ja kaikki mitä tarvitset on määritetty oikein Google account.\n\n maksun tiedot tallennetaan Googlen palvelimille Google-tilisi ja voit helposti käyttää tämän sovelluksen useita devices.\n\n klikkaamalla \'Jatka\' painiketta sinut ohjataan Google Play App maksamiseen.  </string>
    <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">Tyhjennä historia?</string>
    <string name="cpp_clear_history_message">Kaikki historia tyhjennetään.</string>
    <string name="cpp_clear_history">Tyhjennä</string>
--- a/app/src/main/res/values-fi/text_vars.xml
+++ b/app/src/main/res/values-fi/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Määritetty kuten minä kuvitteellinen yksikköä ^ 2 = −1</string>
    <string name="c_var_description_c">Valonnopeus tyhjiössä, m·s</string>
    <string name="c_var_description_G">Painovoimavakio on empiirinen Luonnonvakio laskennassa painovoiman vetovoima sekä objektien massan m ^ 3·kg ^ −1·s ^ −2  </string>
-    <string name="c_var_description_h">Luonnonvakio heijastaa Prahassa Kvanttimekaniikassa, J·s koot  </string>
    <string name="c_var_description_h_reduced">Redusoitu Planckin vakio, J·s</string>
    <string name="c_var_description_nan">Ei ole numero</string>
    <string name="c_var_description_inf">Loputtomuus</string>
--- a/app/src/main/res/values-fi/text_wizard.xml
+++ b/app/src/main/res/values-fi/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Takaisin</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>
  <string name="cpp_wizard_mode_simple_description">Yksinkertaistetussa tilassa vain olennainen toiminnallisuus on saatavilla aloitusnäkymässä.
 Tulokset pyöristetään ylöspäin viiteen desimaaliin ja kulmienn oletusyksikkönä käytetään asteita.</string>
@ -16,21 +14,14 @@ Vastauksia ei pyöristetä ja ne näytetään 10-potenssimuodossa, kulman oletus
    <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">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">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>
-    <string name="cpp_wizard_final_donate">Lahjoittamalla rahaa</string>
-    <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 käyttöön</string>
    <string name="cpp_wizard_dragbutton_description">Painikkeen pyyhkäisy on Calculator++:n erityisominaisuus, jolla pääsee nopeasti toissijaisiin toimintoihin</string>
--- a/app/src/main/res/values-fr/text_strings.xml
+++ b/app/src/main/res/values-fr/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Espace ( )</string>
    <string name="c_calc_grouping_separator">Séparateur de classe</string>
    <string name="c_calc_grouping_separator_summary">Configure les éléments de séparation</string>
-    <string name="p_layout_calculator">Scientifique</string>
-    <string name="p_layout_simple">Simple</string>
    <string name="not_valid_result">Le résultat actuel n\'est pas valide !</string>
    <string name="c_use">Utilisation</string>
    <string name="c_copy_expression">Copier l\'expression</string>
@ -98,40 +96,22 @@
    <string name="open_onscreen_calculator">Cliquez pour ouvrir la calculatrice en mode fenêtré</string>
    <string name="prefs_onscreen_title">Paramètres de la calculatrice (dans une fenêtre séparée)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Lancer au démarrage</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Si coché, Calculator++ apparaîtra dans la barre de notification après redémarrage de l’appareil</string>
    <string name="prefs_onscreen_show_app_icon_title">Afficher l\'icône séparée (nécessite un redémarrage)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Si coché, la seconde icône s\'affichera dans la liste des applications</string>
    <string name="cpp_this_change_may_require_reboot">Cette modification peut nécessiter le redémarrage</string>
    <string name="cpp_plotter">Traceur de fonctions</string>
    <string name="cpp_plot_function_line_color">Couleur de ligne</string>
-    <string name="cpp_plot_function_line_style">Style de ligne</string>
    <string name="cpp_plot_function_line_width">Epaisseur de ligne</string>
-    <string name="cpp_plot_function_settings">Paramètres de fonction</string>
-    <string name="cpp_function">Fonction</string>
-    <string name="cpp_pinned">Épinglé</string>
-    <string name="cpp_visible">Visible</string>
    <string name="cpp_plot_button_text">+tracer</string>
    <string name="cpp_plot_empty_function_error">Impossible de tracer une fonction vide !</string>
    <string name="cpp_plot_too_many_variables">Impossible à tracer : trop de variables !</string>
    <string name="cpp_plot_range">Intervalle de traçage</string>
-    <string name="cpp_fullscreen">Plein écran</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">Nombre invalide !</string>
-    <string name="cpp_plot_boundaries_should_differ">Les limites du graphique ne peuvent pas être les mêmes !</string>
-    <string name="cpp_apply">Appliquer</string>
-    <string name="cpp_message">Message</string>
    <string name="cpp_continue">Continuer</string>
  <string name="cpp_purchase_text">Soutenir le projet est simple et sécurisé : la procédure d\'achat est assurée par Google
 et tout ce dont vous avez besoin est un compte Google correctement configuré.\n\n
 Les informations de paiement sont stockées sur les serveurs Google avec votre compte Google et vous pouvez facilement utiliser cette application sur plusieurs appareils.\n\n
 En cliquant sur le bouton \'Continuer\' vous serez redirigés vers l\'application Google Play afin de réaliser le paiement.</string>
    <string name="cpp_purchase_title">Acheter</string>
-    <string name="cpp_var_show_greek_keyboard">Afficher les lettres Grecques</string>
-    <string name="cpp_var_hide_greek_keyboard">Cacher les lettres Grecques</string>
    <string name="cpp_clear_history_title">Effacer l\'historique ?</string>
    <string name="cpp_clear_history_message">L\'intégralité de l\'historique sera supprimée.</string>
    <string name="cpp_clear_history">Effacer</string>
--- a/app/src/main/res/values-fr/text_vars.xml
+++ b/app/src/main/res/values-fr/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Unité imaginaire telle que i^2 = -1</string>
    <string name="c_var_description_c">Vitesse de la lumière dans le vide, m.s^ -1</string>
    <string name="c_var_description_G">La constante gravitationnelle est une constante physique empirique impliquée dans le calcul de l\'attraction gravitationnelle entre les objets avec la masse, m^3·kg^−1·s^−2</string>
-    <string name="c_var_description_h">Constante physique décrivant un quanta d\'énergie en mécanique quantique, J·s</string>
    <string name="c_var_description_h_reduced">Constante réduite de Planck, J·s</string>
    <string name="c_var_description_nan">Pas un nombre</string>
    <string name="c_var_description_inf">Infini</string>
--- a/app/src/main/res/values-fr/text_wizard.xml
+++ b/app/src/main/res/values-fr/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Retour</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>
  <string name="cpp_wizard_mode_simple_description">En mode simplifié, seules les fonctionnalités de base seront disponibles depuis l\'écran principal. 
 Le résultat est arrondi à 5 chiffres après la virgule et le degré est l\'unité de mesure d\'angle par défaut.</string>
@ -16,21 +14,14 @@ Le résultat n\'est pas arrondi et est affiché en notation scientifique, le rad
    <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">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">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>
-    <string name="cpp_wizard_final_donate">Donation d\'argent</string>
-    <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</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>
--- a/app/src/main/res/values-it/text_strings.xml
+++ b/app/src/main/res/values-it/text_strings.xml
@ -59,8 +59,6 @@
    <string name="p_grouping_separator_space">Spazio ( )</string>
    <string name="c_calc_grouping_separator">Separatore raggruppamento</string>
    <string name="c_calc_grouping_separator_summary">Imposta separatore raggruppamento</string>
-    <string name="p_layout_calculator">Calcolatrice</string>
-    <string name="p_layout_simple">Semplice</string>
    <string name="not_valid_result">Risultato attuale non valido!</string>
    <string name="c_use">Uso</string>
    <string name="c_copy_expression">Copia espressione</string>
@ -103,39 +101,21 @@
    <string name="open_onscreen_calculator">Clicca per aprire la calcolatrice in modalità finestra</string>
    <string name="prefs_onscreen_title">Impostazioni Calculator (in finestra separata)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Apri all\'avvio</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Se selezionato, Calculator + + apparirà nella barra di notifica dopo l\'avvio del dispositivo</string>
    <string name="prefs_onscreen_show_app_icon_title">Visualizza icona separata (richiede riavvio)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se selezionato, la seconda icona apparirà nella lista delle applicazioni</string>
    <string name="cpp_this_change_may_require_reboot">Questo cambiamento potrebbe richiedere il riavvio</string>
    <string name="cpp_plotter">Rappresenta la funzione</string>
    <string name="cpp_plot_function_line_color">Colore linea</string>
-    <string name="cpp_plot_function_line_style">Stile linea</string>
    <string name="cpp_plot_function_line_width">Spessore Linea</string>
-    <string name="cpp_plot_function_settings">Impostazioni funzione</string>
-    <string name="cpp_function">Funzione</string>
-    <string name="cpp_pinned">Bloccato</string>
-    <string name="cpp_visible">Visibile</string>
    <string name="cpp_plot_button_text">Disegna</string>
    <string name="cpp_plot_empty_function_error">Impassibile rappresentare funzioni vuote!</string>
    <string name="cpp_plot_too_many_variables">Impassibile rappresentare: troppe variabili!</string>
    <string name="cpp_plot_range">Intervallo del grafico</string>
-    <string name="cpp_fullscreen">Schermo intero</string>
-    <string name="cpp_plot_range_x_min">Minimo x</string>
-    <string name="cpp_plot_range_x_max">Massimo x</string>
-    <string name="cpp_plot_range_y_min">Minimo y</string>
-    <string name="cpp_plot_range_y_max">Massimo y</string>
-    <string name="cpp_invalid_number">Numero non valido!</string>
-    <string name="cpp_plot_boundaries_should_differ">I limiti del grafico devono essere distinti!</string>
-    <string name="cpp_apply">Applica</string>
-    <string name="cpp_message">Messaggio</string>
    <string name="cpp_continue">Continua</string>
  <string name="cpp_purchase_text">Sostenere il progetto è facile e sicuro: il processo di pagamento è fornito da Google, e tutto ciò di cui hai bisogno è un account correttamente configurato. 
 Le informazioni di pagamento sono memorizzate nei server di Google nel tuo account e puoi utilizzare facilmente  quest\'applicazione su svariati apparecchi.
 premendo \'continua\' sarai indirizzato all\'applicazione Google play per effettuare il pagamento. </string>
    <string name="cpp_purchase_title">Acquista</string>
-    <string name="cpp_var_show_greek_keyboard">Mostra caratteri greci</string>
-    <string name="cpp_var_hide_greek_keyboard">Nascondi caratteri greci</string>
    <string name="cpp_clear_history_title">Eliminare la cronologia?</string>
    <string name="cpp_clear_history_message">L\'intera cronologia verrà cancellata.</string>
    <string name="cpp_clear_history">Svuota</string>
--- a/app/src/main/res/values-it/text_vars.xml
+++ b/app/src/main/res/values-it/text_vars.xml
@ -14,9 +14,6 @@
  <string name="c_var_description_G">La costante gravitazionale è una costante fisica empirica coinvolta nel calcolo
 		dell\' attrazione gravitazionale tra gli oggetti con massa, m^3·kg^−1·s^−2
 	</string>
-  <string name="c_var_description_h">Costante fisica che riflette la dimensione dei quanti di energia in meccanica
-		quantistica, J·s
-	</string>
    <string name="c_var_description_h_reduced">Costante di riduzione di Planck, J·s</string>
    <string name="c_var_description_nan">Non è un numero</string>
    <string name="c_var_description_inf">Infinito</string>
--- a/app/src/main/res/values-it/text_wizard.xml
+++ b/app/src/main/res/values-it/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Indietro</string>
    <string name="cpp_wizard_start">Avvia la procedura guidata</string>
    <string name="cpp_wizard_finish">Fatto</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>
    <string name="cpp_wizard_mode_simple_description">Nella modaltà semplificata solo le funzionalità di base saranno disponibili dalla schermata principale. I risultati sono arrotondati fino a 5 cifre, i gradi sono utilizzati come unità di misura predefinita per gli angoli.</string>
    <string name="cpp_wizard_mode_engineer">Ingegnere</string>
@ -15,21 +13,14 @@ Il risultato non è arrotondato, ed è presentato in notazione scientifica, i ra
    <string name="cpp_wizard_dragbutton_action_end">Eccellente! Toccare il pulsante ancora una volta per riprovare</string>
    <string name="cpp_wizard_dragbutton_action_center">Toccare il pulsante qui sotto una volta sola per utilizzare 9</string>
    <string name="cpp_wizard_dragbutton_action_up">Trascina dal centro del pulsante verso l\'alto per utilizzare %</string>
-    <string name="cpp_wizard_dragbutton_action_left">Trascina dal centro del pulsante verso sinistra per utilizzare sin</string>
    <string name="cpp_wizard_dragbutton_action_down">Trascina dal centro del pulsante verso il basso per utilizzare ^2</string>
    <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">Scegli tema</string>
    <string name="cpp_wizard_onscreen_calculator_title">Calcolatrice in una finestra separata</string>
    <string name="cpp_wizard_dragbutton_title">Nozioni di base trascinamento pulsanti</string>
    <string name="cpp_wizard_final_done">L\'app è configurata e pronta all\'uso.</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>
-    <string name="cpp_wizard_final_donate">Donando denaro</string>
-    <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">Abilita</string>
  <string name="cpp_wizard_dragbutton_description">Il trascinamento pulsanti è una funzione esclusiva di Calculator++ che permette un accesso rapido alle funzioni secondarie
--- a/app/src/main/res/values-ja/text_strings.xml
+++ b/app/src/main/res/values-ja/text_strings.xml
@ -56,8 +56,6 @@
    <string name="p_grouping_separator_space">スペース( )</string>
    <string name="c_calc_grouping_separator">グループの区切り</string>
    <string name="c_calc_grouping_separator_summary">グループの区切りを設定します</string>
-    <string name="p_layout_calculator">科学</string>
-    <string name="p_layout_simple">シンプル</string>
    <string name="not_valid_result">現在の結果が正しくありません!</string>
    <string name="c_use">使う</string>
    <string name="c_copy_expression">式をコピー</string>
@ -100,40 +98,22 @@
    <string name="open_onscreen_calculator">クリックしてウィンドウモードで電卓を開きます</string>
    <string name="prefs_onscreen_title">電卓(ウィンドウモード)の設定</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">起動時に自動で開始する</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">有効にするとアプリケーションのリストに2つ目のアイコンを表示します</string>
    <string name="cpp_this_change_may_require_reboot">この変更は再起動を必要とします</string>
    <string name="cpp_plotter">関数プロッター</string>
    <string name="cpp_plot_function_line_color">線の色</string>
-    <string name="cpp_plot_function_line_style">線のスタイル</string>
    <string name="cpp_plot_function_line_width">線の幅</string>
-    <string name="cpp_plot_function_settings">関数の設定</string>
-    <string name="cpp_function">関数</string>
-    <string name="cpp_pinned">固定</string>
-    <string name="cpp_visible">可視</string>
    <string name="cpp_plot_button_text">+プロット</string>
    <string name="cpp_plot_empty_function_error">空の関数をプロットすることはできません</string>
    <string name="cpp_plot_too_many_variables">プロットすることができません: 変数が多すぎます！</string>
    <string name="cpp_plot_range">グラフの範囲</string>
-    <string name="cpp_fullscreen">全画面表示</string>
-    <string name="cpp_plot_range_x_min">Xの最小</string>
-    <string name="cpp_plot_range_x_max">Xの最大</string>
-    <string name="cpp_plot_range_y_min">Yの最小</string>
-    <string name="cpp_plot_range_y_max">Yの最大</string>
-    <string name="cpp_invalid_number">数が無効です!</string>
-    <string name="cpp_plot_boundaries_should_differ">グラフの境界を同じにしないでください！</string>
-    <string name="cpp_apply">適用</string>
-    <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>
    <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">履歴を消去しますか？</string>
    <string name="cpp_clear_history_message">すべての履歴が消去されます。</string>
    <string name="cpp_clear_history">消去</string>
--- a/app/src/main/res/values-ja/text_vars.xml
+++ b/app/src/main/res/values-ja/text_vars.xml
@ -10,8 +10,6 @@
    <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_h_reduced">減らされたプランク定数(J·s)</string>
    <string name="c_var_description_nan">数値ではない</string>
    <string name="c_var_description_inf">無限</string>
--- a/app/src/main/res/values-ja/text_wizard.xml
+++ b/app/src/main/res/values-ja/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
  <string name="cpp_wizard_mode_simple_description">シンプルモードでは基本的な関数のみが利用可能です。
 結果は5桁でまるめられ、角度の単位は初期設定のものが用いられます。</string>
@ -17,22 +15,14 @@
    <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_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>
    <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>
-    <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">別窓での電卓の利用を有効にすると、お使いのデバイスで別のアプリを利用中に電卓を利用することが出来ます
 	</string>
    <string name="cpp_wizard_onscreen_checkbox">有効化</string>
--- a/app/src/main/res/values-nl/text_strings.xml
+++ b/app/src/main/res/values-nl/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Spatie ( )</string>
    <string name="c_calc_grouping_separator">Groeperingsscheidingsteken</string>
    <string name="c_calc_grouping_separator_summary">Configureert scheiding tussen groepen</string>
-    <string name="p_layout_calculator">Wetenschappelijk</string>
-    <string name="p_layout_simple">Eenvoudig</string>
    <string name="not_valid_result">Huidige resultaat is niet geldig!</string>
    <string name="c_use">Gebruik</string>
    <string name="c_copy_expression">Kopieer expressie</string>
@ -100,39 +98,21 @@
    <string name="open_onscreen_calculator">Klik om de rekenmachine te openen in de venstermodus</string>
    <string name="prefs_onscreen_title">Rekenmachine (in apart venster) instellingen</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Starten bij het opstarten</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Indien aangevinkt verschijnt Calculator++ in het systeemvak na heropstarten</string>
    <string name="prefs_onscreen_show_app_icon_title">Toon afzonderlijk pictogram (opnieuw opstarten is vereist)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Indien aangevinkt wordt een tweed icoon zichtbaar in de app lijst</string>
    <string name="cpp_this_change_may_require_reboot">Deze wijziging vereist mogelijks opnieuw op te starten</string>
    <string name="cpp_plotter">Functie plotter</string>
    <string name="cpp_plot_function_line_color">Lijnkleur</string>
-    <string name="cpp_plot_function_line_style">Lijnstijl</string>
    <string name="cpp_plot_function_line_width">Lijndikte</string>
-    <string name="cpp_plot_function_settings">Functie-instellingen</string>
-    <string name="cpp_function">Functie</string>
-    <string name="cpp_pinned">Vast</string>
-    <string name="cpp_visible">Zichtbaar</string>
    <string name="cpp_plot_button_text">+plot</string>
    <string name="cpp_plot_empty_function_error">Onmogelijk om te plotten lege functie!</string>
    <string name="cpp_plot_too_many_variables">Onmogelijk om te plotten: te veel variabelen!</string>
    <string name="cpp_plot_range">Grafiek bereik</string>
-    <string name="cpp_fullscreen">Volledig Scherm</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">Ongeldig getal!</string>
-    <string name="cpp_plot_boundaries_should_differ">Grafiek grenzen mogen niet hetzelfde zijn!</string>
-    <string name="cpp_apply">Toepassen</string>
-    <string name="cpp_message">Bericht</string>
    <string name="cpp_continue">Volgende</string>
  <string name="cpp_purchase_text">Het project steunen is eenvoudig en veilig: aankopen worden geregeld door Google, je hebt slechts een werkend google account nodig.\n\n
 Informatie over betalingen worden opgeslagen in uw account op de Google servers en u kan deze app perfect op meerdere apparaten gebruiken.\n\n
 Door op volgende te drukken, wordt u doorverwezen naar de Google Play store om de betaling uit te voeren.</string>
    <string name="cpp_purchase_title">Aankopen</string>
-    <string name="cpp_var_show_greek_keyboard">Toon Griekse letters</string>
-    <string name="cpp_var_hide_greek_keyboard">Verberg Griekse letters</string>
    <string name="cpp_clear_history_title">Geschiedenis wissen?</string>
    <string name="cpp_clear_history_message">Alle geschiedenis wordt gewist.</string>
    <string name="cpp_clear_history">Verwijder</string>
--- a/app/src/main/res/values-nl/text_vars.xml
+++ b/app/src/main/res/values-nl/text_vars.xml
@ -6,9 +6,6 @@
    <string name="c_var_description_i">Imaginaire eenheid, die zijn gedefinieerd zoals i ^ 2 = −1</string>
    <string name="c_var_description_c">Snelheid van het licht in vacuüm, m·s</string>
    <string name="c_var_description_G">De gravitatieconstante is een empirische natuurkundige constante die betrokken is bij de berekening van de gravitationele aantrekking tussen objecten met massa, m^3·kg^−1·s^2</string>
-  <string name="c_var_description_h">Natuurkundige constante voor de grootte van energie quanta in quantummechanica,
-		J·s
-	</string>
    <string name="c_var_description_h_reduced">Gereduceerde Planck-constante, J·s</string>
    <string name="c_var_description_nan">Geen getal</string>
    <string name="c_var_description_inf">Oneindig</string>
--- a/app/src/main/res/values-nl/text_wizard.xml
+++ b/app/src/main/res/values-nl/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Terug</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>
    <string name="cpp_wizard_mode_simple_description">In de simple mode zal alleen basis functionaliteit beschikbaar zijn van het belangrijkste scherm.   Resultaat is afgerond tot op maximaal 5 cijfers, graden worden gebruikt als de standaardeenheden voor hoeken. </string>
    <string name="cpp_wizard_mode_engineer">Ingenieur</string>
@ -15,21 +13,14 @@ Resultaat is niet afgerond en wordt gepresenteerd in de ingenieursnotatie, radia
    <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">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">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>
-    <string name="cpp_wizard_final_donate">Geld doneren</string>
-    <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">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>
--- a/app/src/main/res/values-pl/text_strings.xml
+++ b/app/src/main/res/values-pl/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Spacja ( )</string>
    <string name="c_calc_grouping_separator">Grupowanie cyfr</string>
    <string name="c_calc_grouping_separator_summary">Ustawia znak grupujący cyfry</string>
-    <string name="p_layout_calculator">Naukowy</string>
-    <string name="p_layout_simple">Prosty</string>
    <string name="not_valid_result">Obecny wynik jest nieprawidłowy!</string>
    <string name="c_use">Użyj</string>
    <string name="c_copy_expression">Skopiuj wyrażenie</string>
@ -98,37 +96,19 @@
    <string name="open_onscreen_calculator">Kliknij, aby otworzyć kalkulator w trybie okna</string>
    <string name="prefs_onscreen_title">Ustawienia kalkulatora (w osobnym oknie)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Uruchom przy starcie systemu</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Jeżeli opcja jest włączona, Calculator++ pojawi się na górnej belce po uruchomieniu urządzenia</string>
    <string name="prefs_onscreen_show_app_icon_title">Pokaż oddzielną ikonę (wymagany restart)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Druga ikona pojawi się na liście aplikacji</string>
    <string name="cpp_this_change_may_require_reboot">Ta zmiana może wymagać ponownego uruchomienia</string>
    <string name="cpp_plotter">Wykresy</string>
    <string name="cpp_plot_function_line_color">Kolor linii</string>
-    <string name="cpp_plot_function_line_style">Styl linii</string>
    <string name="cpp_plot_function_line_width">Szerekość linii</string>
-    <string name="cpp_plot_function_settings">Ustawienia funkcji</string>
-    <string name="cpp_function">Funkcja</string>
-    <string name="cpp_pinned">Przypięta</string>
-    <string name="cpp_visible">Widoczna</string>
    <string name="cpp_plot_button_text">+wykres</string>
    <string name="cpp_plot_empty_function_error">Nie można wykreślić pustej funkcji!</string>
    <string name="cpp_plot_too_many_variables">Nie można wyrysować: zbyt wiele zmiennych!</string>
    <string name="cpp_plot_range">Zakres wykresu</string>
-    <string name="cpp_fullscreen">Pełny ekran</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">Nieprawidłowa liczba!</string>
-    <string name="cpp_plot_boundaries_should_differ">Granice wykresu nie powinny być identyczne!</string>
-    <string name="cpp_apply">Zastosuj</string>
-    <string name="cpp_message">Wiadomość</string>
    <string name="cpp_continue">Kontynuuj</string>
    <string name="cpp_purchase_text">Wsparcie projektu jest proste i bezpieczne: proces płatności zapewnia Google i potrzebne jest jedynie poprawnie skonfigurowane konto Google.\n\nInformacja o płatności jest przypisana do Twojego konta na serwerach Google i możesz łatwo używać tej aplikacji na kilku urządzeniach.\n\nGdy naciśniesz przycisk \'Kontynuuj\', zostaniesz przekierowany do aplikacji Google Play w celu wykonania płatności.</string>
    <string name="cpp_purchase_title">Zakup</string>
-    <string name="cpp_var_show_greek_keyboard">Pokaż greckie litery</string>
-    <string name="cpp_var_hide_greek_keyboard">Schowaj greckie litery</string>
    <string name="cpp_clear_history_title">Wyczyścić historię?</string>
    <string name="cpp_clear_history_message">Cała historia zostanie usunięta.</string>
    <string name="cpp_clear_history">Wyczyszczono</string>
--- a/app/src/main/res/values-pl/text_vars.xml
+++ b/app/src/main/res/values-pl/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Jednostka urojona, zdefiniowana, tak że i^2 = -1</string>
    <string name="c_var_description_c">Prędkość światła w próżni, [m·s]</string>
    <string name="c_var_description_G">Stała grawitacji jest empiryczną stałą fizyczną służącą do obliczeń przyciągania grawitacyjnego między obiektami posiadającymi masę, [m^3·kg^−1·s^−2]</string>
-    <string name="c_var_description_h">Stała Plancka to stała fizyczna, która opisuje wielkość kwantów energii w mechanice kwantowej, [J·s]</string>
    <string name="c_var_description_h_reduced">Zredukowana stała Plancka, [J·s]</string>
    <string name="c_var_description_nan">Nie jest liczbą</string>
    <string name="c_var_description_inf">Nieskończoność</string>
--- a/app/src/main/res/values-pl/text_wizard.xml
+++ b/app/src/main/res/values-pl/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Wstecz</string>
    <string name="cpp_wizard_start">Rozpocznij konfigurację</string>
    <string name="cpp_wizard_finish">Gotowe</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>
  <string name="cpp_wizard_mode_simple_description">W trybie prostym tylko podstawowe funkcje będą dostępne na ekranie głównym.
 Wynik jest zaokrąglony do 5 cyfr, a domyślną jednostką wielkości kąta są stopnie.</string>
@ -16,22 +14,14 @@ Wynik nie jest zaokrąglony i jest przedstawiony w postaci inżynierskiej, a dom
    <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">Przesuń palcem z centrum przycisku w górę, aby użyć %</string>
-    <string name="cpp_wizard_dragbutton_action_left">Przesuń palcem z centrum przycisku w lewo, aby użyć sinus</string>
    <string name="cpp_wizard_dragbutton_action_down">Przesuń palcem z centrum przycisku w dół, aby użyć ^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">Wybierz motyw</string>
    <string name="cpp_wizard_onscreen_calculator_title">Kalkulator w osobnym oknie</string>
    <string name="cpp_wizard_dragbutton_title">Podstawy przesuwania palcem po przycisku</string>
    <string name="cpp_wizard_final_done">Aplikacja jest ustawiona i gotowa do użycia.</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>
-    <string name="cpp_wizard_final_ways_to_help">Istnieje kilka sposobów poprzez które możesz pomóc ulepszyć aplikację:</string>
-    <string name="cpp_wizard_final_donate">Wsparcie finansowe</string>
-    <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</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>
--- a/app/src/main/res/values-pt-rBR/text_strings.xml
+++ b/app/src/main/res/values-pt-rBR/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Espaço ( )</string>
    <string name="c_calc_grouping_separator">Separador de agrupamento</string>
    <string name="c_calc_grouping_separator_summary">Separador de agrupamento de conjuntos</string>
-    <string name="p_layout_calculator">Científica</string>
-    <string name="p_layout_simple">Simples</string>
    <string name="not_valid_result">O resultado atual não é válido!</string>
    <string name="c_use">Uso</string>
    <string name="c_copy_expression">Copiar expressão</string>
@ -98,37 +96,19 @@
    <string name="open_onscreen_calculator">Clique para abrir a calculadora no modo de janela</string>
    <string name="prefs_onscreen_title">Configurações de calculadora (em uma janela separada)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Executar aplicativo na inicialização do sistema</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Se ligado, a calculadora aparecerá na barra de notificação após a inicialização do dispositivo</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se ligado, um segundo ícone será mostrado na lista de aplicações</string>
    <string name="cpp_this_change_may_require_reboot">Essa mudança pode exigir reinicialização</string>
    <string name="cpp_plotter">Plotadora de função</string>
    <string name="cpp_plot_function_line_color">Cor da linha</string>
-    <string name="cpp_plot_function_line_style">Estilo de linha</string>
    <string name="cpp_plot_function_line_width">Largura da linha</string>
-    <string name="cpp_plot_function_settings">Configurações de função</string>
-    <string name="cpp_function">Função</string>
-    <string name="cpp_pinned">Fixo</string>
-    <string name="cpp_visible">Visível</string>
    <string name="cpp_plot_button_text">+plot</string>
    <string name="cpp_plot_empty_function_error">Não é possível plotar uma função vazia!</string>
    <string name="cpp_plot_too_many_variables">Não é possível plotar: muitas variáveis!</string>
    <string name="cpp_plot_range">Escala do gráfico</string>
-    <string name="cpp_fullscreen">Tela cheia</string>
-    <string name="cpp_plot_range_x_min">X Min</string>
-    <string name="cpp_plot_range_x_max">X Max</string>
-    <string name="cpp_plot_range_y_min">Y Min</string>
-    <string name="cpp_plot_range_y_max">Max Y</string>
-    <string name="cpp_invalid_number">Número inválido!</string>
-    <string name="cpp_plot_boundaries_should_differ">Os limites do gráfico não devem ser o mesmo!</string>
-    <string name="cpp_apply">Aplicar</string>
-    <string name="cpp_message">Mensagem</string>
    <string name="cpp_continue">Continuar</string>
    <string name="cpp_purchase_text">Apoiar o projeto é fácil e seguro: o processo de compra é fornecido pelo Google e tudo que você precisa é ums conta do Google corretamente configurada.\n\n As informações sobre pagamento são armazenadas nos servidores do Google com sua conta do Google e você pode facilmente usar esta aplicação em vários dispositivos.\n\n, Clicando o botão \'Continuar\', você será redirecionado para o aplicativo Google para fazer o pagamento.</string>
    <string name="cpp_purchase_title">Comprar</string>
-    <string name="cpp_var_show_greek_keyboard">Mostrar letras gregas</string>
-    <string name="cpp_var_hide_greek_keyboard">Mostrar letras gregas</string>
    <string name="cpp_clear_history_title">Limpar histórico?</string>
    <string name="cpp_clear_history_message">O histórico será apagado.</string>
    <string name="cpp_clear_history">Limpar	</string>
--- a/app/src/main/res/values-pt-rBR/text_vars.xml
+++ b/app/src/main/res/values-pt-rBR/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Unidade imaginária, definida como i^2 = − 1</string>
    <string name="c_var_description_c">Velocidade da luz no vácuo, m·s</string>
    <string name="c_var_description_G">A constante gravitacional é uma constante física empírica envolvida no cálculo da atração gravitacional entre objetos com massa, m^ 3·kg^−1·s^−2 </string>
-    <string name="c_var_description_h">Constante física que reflete a quantidade de energia de uma quantum na mecânica quântica, J·s</string>
    <string name="c_var_description_h_reduced">Constante de Planck reduzida, J·s</string>
    <string name="c_var_description_nan">Não é um número</string>
    <string name="c_var_description_inf">Infinito</string>
--- a/app/src/main/res/values-pt-rBR/text_wizard.xml
+++ b/app/src/main/res/values-pt-rBR/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Voltar</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>
    <string name="cpp_wizard_mode_simple_description">No modo simples, apenas as funcionalidades básicas estarão disponíveis na tela principal. Os resultados serão arredondados para 5 dígitos e os ângulos serão medidos em grau.</string>
    <string name="cpp_wizard_mode_engineer">Engenheiro</string>
@ -14,21 +12,14 @@
    <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 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">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>
-    <string name="cpp_wizard_final_donate">Doando dinheiro</string>
-    <string name="cpp_wizard_final_translate">Traduzindo</string>
-    <string name="cpp_wizard_final_contribute">Contribuindo com código-fonte</string>
    <string name="cpp_wizard_onscreen_description">A calculadora em janela separada permite que você faça cálculos enquanto estiver usando outros aplicativos no seu dispositivo</string>
    <string name="cpp_wizard_onscreen_checkbox">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>
--- a/app/src/main/res/values-pt-rPT/text_strings.xml
+++ b/app/src/main/res/values-pt-rPT/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Espaço ( )</string>
    <string name="c_calc_grouping_separator">Separador de grupo</string>
    <string name="c_calc_grouping_separator_summary">Aplica o separador de grupo</string>
-    <string name="p_layout_calculator">Científica</string>
-    <string name="p_layout_simple">Simples</string>
    <string name="not_valid_result">O resultado actual não é válido!</string>
    <string name="c_use">Uso</string>
    <string name="c_copy_expression">Copia expressão</string>
@ -98,37 +96,19 @@
    <string name="open_onscreen_calculator">Clique para abrir a calculadora em modo de janela</string>
    <string name="prefs_onscreen_title">Configurações da calculadora (em modo de janela)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Executar na inicialização</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Se selecionado a Calculator++ aparecerá na barra de notificação após a inicialização</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se selecionado, o segundo ícone será mostrado na lista de aplicações</string>
    <string name="cpp_this_change_may_require_reboot">Esta alteração pode necessitar de reinicialização</string>
    <string name="cpp_plotter">Funções de plotagem</string>
    <string name="cpp_plot_function_line_color">Cor da linha</string>
-    <string name="cpp_plot_function_line_style">Estilo de linha</string>
    <string name="cpp_plot_function_line_width">Largura da linha</string>
-    <string name="cpp_plot_function_settings">Definições de funções</string>
-    <string name="cpp_function">Função</string>
-    <string name="cpp_pinned">Fixo</string>
-    <string name="cpp_visible">Visível</string>
    <string name="cpp_plot_button_text">+plotar</string>
    <string name="cpp_plot_empty_function_error">Não é possível desenhar função vazia!</string>
    <string name="cpp_plot_too_many_variables">Não é possível desenhar: muitas variáveis!</string>
    <string name="cpp_plot_range">Intervalo do gráfico</string>
-    <string name="cpp_fullscreen">Ecrã completo</string>
-    <string name="cpp_plot_range_x_min">X Mínimo</string>
-    <string name="cpp_plot_range_x_max">X Máximo</string>
-    <string name="cpp_plot_range_y_min">Y Mínimo</string>
-    <string name="cpp_plot_range_y_max">Y Máximo</string>
-    <string name="cpp_invalid_number">Número inválido!</string>
-    <string name="cpp_plot_boundaries_should_differ">Os limites do gráfico não devem ser os mesmos!</string>
-    <string name="cpp_apply">Aplicar</string>
-    <string name="cpp_message">Mensagem</string>
    <string name="cpp_continue">Continuar</string>
    <string name="cpp_purchase_text">Apoiar o projeto é fácil e seguro: o processo de compra é fornecido pelo Google e tudo que você precisa ter é uma conta Google corretamente configurada.\n\n As informações de pagamento são armazenadas nos servidores do Google com sua conta Google e poderá facilmente usar esta aplicação em vários dispositivos.\n\n Ao clicar no botão \"Continuar\" será redirecionado para o Google Play para fazer o pagamento.</string>
    <string name="cpp_purchase_title">Comprar</string>
-    <string name="cpp_var_show_greek_keyboard">Mostrar caracteres gregos</string>
-    <string name="cpp_var_hide_greek_keyboard">Esconder caracteres gregos</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>
--- a/app/src/main/res/values-pt-rPT/text_vars.xml
+++ b/app/src/main/res/values-pt-rPT/text_vars.xml
@ -6,8 +6,6 @@
    <string name="c_var_description_i">Unidade imaginária, definida tal que i^2 = -1</string>
    <string name="c_var_description_c">Velocidade da luz no vácuo, m.s</string>
    <string name="c_var_description_G">A constante gravitacional é uma constante física empírica envolvida no cálculo da atracção gravitacional entre dois objectos com massa, m^3·kg^−1·s^−2</string>
-  <string name="c_var_description_h">Constante física que reflecte os tamanhos da energia quanta na mecânica quântica, J·s
-	</string>
    <string name="c_var_description_h_reduced">Constante de Planck reduzida, J·s</string>
    <string name="c_var_description_nan">Não é um número</string>
    <string name="c_var_description_inf">Infinidade</string>
--- a/app/src/main/res/values-pt-rPT/text_wizard.xml
+++ b/app/src/main/res/values-pt-rPT/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Voltar</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>
  <string name="cpp_wizard_mode_simple_description">No modo simples apenas as funcionalidades básicas estarão disponíveis a partir do ecrã principal.
 O resultado é arredondado para 5 dígitos, graus são usados por defeito como unidades de ângulo.</string>
@ -16,21 +14,14 @@ O resultado não é arredondado e é apresentado em notação de engenheiro, rad
    <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 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">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">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">Habilitado</string>
  <string name="cpp_wizard_dragbutton_description">A função de arrastar teclas é exclusiva do Calculator++, o que permite
--- a/app/src/main/res/values-ru/text_strings.xml
+++ b/app/src/main/res/values-ru/text_strings.xml
@ -64,8 +64,6 @@
    <string name="p_grouping_separator_space">Пробел ( )</string>
    <string name="c_calc_grouping_separator">Разделитель разрядов</string>
    <string name="c_calc_grouping_separator_summary">Устанавливает разделитель разрядов числа</string>
-    <string name="p_layout_calculator">Научная</string>
-    <string name="p_layout_simple">Простая</string>
    <string name="not_valid_result">Результат не допустим!</string>
    <string name="c_use">Использовать</string>
    <string name="c_copy_expression">Копировать выражение</string>
@ -116,10 +114,6 @@
    <string name="open_onscreen_calculator">Нажмите чтобы открыть калькулятор в отдельном окне</string>
    <string name="prefs_onscreen_title">Настройки калькулятора в отдельном окне</string>
    <string name="prefs_widget_title">Настройки виджета</string>
-    <string name="prefs_onscreen_start_on_boot_title">Запуск после загрузки устройства</string>
-  <string name="prefs_onscreen_start_on_boot_summary">Если включено, то кнопка Калькулятора++ будет доступна в панели
-		уведомлений после загрузки устройства
-	</string>
  <string name="prefs_onscreen_show_app_icon_title">Показывать отдельную иконку (может потребовать перезагрузки)
 	</string>
  <string name="prefs_onscreen_show_app_icon_summary">Если включено, то вторая иконка будет добавлена в список
@ -128,25 +122,11 @@
    <string name="cpp_this_change_may_require_reboot">Это изменение может потребовать перезагрузки</string>
    <string name="cpp_plotter">Графопостроитель</string>
    <string name="cpp_plot_function_line_color">Цвет линии</string>
-    <string name="cpp_plot_function_line_style">Тип линии</string>
    <string name="cpp_plot_function_line_width">Толщина линии</string>
-    <string name="cpp_plot_function_settings">Настройки функции</string>
-    <string name="cpp_function">Функция</string>
-    <string name="cpp_pinned">Закреплена</string>
-    <string name="cpp_visible">Видна</string>
    <string name="cpp_plot_button_text">+граф</string>
    <string name="cpp_plot_empty_function_error">Невозможно построить пустую функцию!</string>
    <string name="cpp_plot_too_many_variables">Невозможно построить функцию: слишком много переменных!</string>
    <string name="cpp_plot_range">Интервал построения</string>
-    <string name="cpp_fullscreen">Полноэкранный режим</string>
-    <string name="cpp_plot_range_x_min">X мин</string>
-    <string name="cpp_plot_range_x_max">X макс</string>
-    <string name="cpp_plot_range_y_min">Y мин</string>
-    <string name="cpp_plot_range_y_max">Y макс</string>
-    <string name="cpp_invalid_number">Неправильное число!</string>
-    <string name="cpp_plot_boundaries_should_differ">Границы графика не могут быть равны!</string>
-    <string name="cpp_apply">Применить</string>
-    <string name="cpp_message">Сообщение</string>
    <string name="cpp_continue">Продолжить</string>
  <string name="cpp_purchase_text">Поддержать проект очень легко и безопасно: процесс покупки проводится Google и всё
 		что вам нужно - это настроенный Google аккаунт.\n\n
@ -155,8 +135,6 @@
 		По нажатию кнопки \'Продолжить\' вы будете перенаправлены в приложение 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">Очистить историю?</string>
    <string name="cpp_clear_history_message">Вся история будет очищена.</string>
    <string name="cpp_clear_history">Очистить</string>
--- a/app/src/main/res/values-ru/text_vars.xml
+++ b/app/src/main/res/values-ru/text_vars.xml
@ -11,9 +11,6 @@
    <string name="c_var_description_i">Мнимая единица, определённая как i^2 = −1</string>
    <string name="c_var_description_c">Скорость света в вакууме, м·с</string>
    <string name="c_var_description_G">Гравитационная постоянная, с^3·кг^−1·с^−2</string>
-  <string name="c_var_description_h">Постоянная Планка - коэффициент, связывающий величину энергии электромагнитного
-		излучения с его частотой, Дж·с
-	</string>
    <string name="c_var_description_h_reduced">Приведённая постоянная Планка, Дж·с</string>
    <string name="c_var_description_nan">Не число</string>
    <string name="c_var_description_inf">Бесконечность</string>
--- a/app/src/main/res/values-ru/text_wizard.xml
+++ b/app/src/main/res/values-ru/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
    <string name="cpp_wizard_mode_simple_description">В простом режиме только базовая функциональность доступна на главном экране. Результат округляется до 5 знаков, градусы установлены единицами измерения углов по умолчанию.</string>
    <string name="cpp_wizard_mode_engineer">Инженерный</string>
@ -14,21 +12,14 @@
    <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_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>
    <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>
-    <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">Калькулятор в отдельном окне позволяет вам произодить вычисления не закрывая при этом другие приложения</string>
    <string name="cpp_wizard_onscreen_checkbox">Включить</string>
    <string name="cpp_wizard_dragbutton_description">Специально разработанные кнопки позволяют быстро и просто использовать дополнительные возможности калькулятора</string>
--- a/app/src/main/res/values-tr/text_strings.xml
+++ b/app/src/main/res/values-tr/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Boşluk ()</string>
    <string name="c_calc_grouping_separator">Gruplama ayracı</string>
    <string name="c_calc_grouping_separator_summary">Gruplama ayracını ayarlayın</string>
-    <string name="p_layout_calculator">Bilimsel</string>
-    <string name="p_layout_simple">Basit</string>
    <string name="not_valid_result">Şu anki sonuç geçerli değil!</string>
    <string name="c_use">Kullan</string>
    <string name="c_copy_expression">İfadeyi kopyala</string>
@ -74,7 +72,7 @@
    <string name="c_angle_units_changed_to">Açı birimi \'%s\' olarak değişti!</string>
    <string name="c_numeral_base_changed_to">Sayı tabanı \'%s\' olarak değişti!</string>
    <string name="c_conversion_tool">Çeviri aracı</string>
-    <string name="c_convert">Çeviriliyor...</string>
+    <string name="c_convert">Çeviriliyor…</string>
    <string name="convert_to_hex">Hex\'e dönüştür</string>
    <string name="convert_to_bin">Bin\'e dönüştür</string>
    <string name="convert_to_dec">Dec\' e dönüştür</string>
@ -98,37 +96,19 @@
    <string name="open_onscreen_calculator">Hesap makinesini pencere modunda açmak için tıklayın</string>
    <string name="prefs_onscreen_title">Hesap makinesi (ayrı pencerede) ayarları</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Açılışta başlatma</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Eğer açıksa Calculator++ cihaz başlatıldıktan sonra bildirim çubuğunda görünecek</string>
    <string name="prefs_onscreen_show_app_icon_title">Ayrı simge göster (yeniden başlatma gerektirir)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Eğer açıksa ikinci simge uygulama listesinde görünecek</string>
    <string name="cpp_this_change_may_require_reboot">Bu değişiklik, yeniden başlatma gerektirebilir</string>
    <string name="cpp_plotter">İşlev çizici</string>
    <string name="cpp_plot_function_line_color">Çizgi rengi</string>
-    <string name="cpp_plot_function_line_style">Çizgi stili</string>
    <string name="cpp_plot_function_line_width">Çizgi genişliği</string>
-    <string name="cpp_plot_function_settings">İşlev ayarları</string>
-    <string name="cpp_function">İşlev</string>
-    <string name="cpp_pinned">Sabitlenmiş</string>
-    <string name="cpp_visible">Görünür</string>
    <string name="cpp_plot_button_text">+çizim</string>
    <string name="cpp_plot_empty_function_error">Boş fonksiyon çizilemez!</string>
    <string name="cpp_plot_too_many_variables">Çizilemez: çok fazla değişken var!</string>
    <string name="cpp_plot_range">Grafik aralığı</string>
-    <string name="cpp_fullscreen">Tam ekran</string>
-    <string name="cpp_plot_range_x_min">X Min</string>
-    <string name="cpp_plot_range_x_max">X Maks</string>
-    <string name="cpp_plot_range_y_min">Y Min</string>
-    <string name="cpp_plot_range_y_max">Y Maks</string>
-    <string name="cpp_invalid_number">Geçersiz sayı!</string>
-    <string name="cpp_plot_boundaries_should_differ">Grafik sınırları aynı olmamalı!</string>
-    <string name="cpp_apply">Uygula</string>
-    <string name="cpp_message">Mesaj</string>
    <string name="cpp_continue">Devam</string>
    <string name="cpp_purchase_text">Projeye destek kolay ve güvenli: satın alma işlemi Google tarafından sağlanıyor ve gereken tek şey düzgün yapılandırılmış bir Google hesabı.\n\n ödeme bilgileri Google hesabınızla Google sunucularında saklanır ve kolayca bu uygulamayı birçok cihazda kullanabilirsiniz.\n\n Eğer \'Devam\' a tıklarsanız ödemeyi yapmak için Google Play\'e yönlendirileceksiniz.</string>
    <string name="cpp_purchase_title">Satın al</string>
-    <string name="cpp_var_show_greek_keyboard">Yunan harflerini göster</string>
-    <string name="cpp_var_hide_greek_keyboard">Yunan harflerini gizle</string>
    <string name="cpp_clear_history_title">Geçmişi Temizle?</string>
    <string name="cpp_clear_history_message">Tüm geçmiş temizlenecek.</string>
    <string name="cpp_clear_history">Sil</string>
--- a/app/src/main/res/values-tr/text_vars.xml
+++ b/app/src/main/res/values-tr/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">i^2=-1 ile  tanımlanan sanal birim</string>
    <string name="c_var_description_c">Işığın boşluktaki (uzay boşluğu) hızı, m/s</string>
    <string name="c_var_description_G">Yer çekimi sabiti kütlesi bulunan iki cismin arasındaki kütlesel çekimi hesaplamakta kullanılan deneysel bir fizik sabitidir, m^3.kg^-1.s^-2</string>
-    <string name="c_var_description_h">Kuantum mekaniğinde kuanta enerji boyutlarını temsil eden fiziksel sabit, J.s</string>
    <string name="c_var_description_h_reduced">İndirgenmiş Planck sabiti, J.s</string>
    <string name="c_var_description_nan">Bir sayı değil</string>
    <string name="c_var_description_inf">Sonsuz</string>
--- a/app/src/main/res/values-tr/text_wizard.xml
+++ b/app/src/main/res/values-tr/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Geri</string>
    <string name="cpp_wizard_start">Sihirbazı Başlat</string>
    <string name="cpp_wizard_finish">Tamamlandı</string>
-    <string name="cpp_wizard_layout_optimized">Optimize edildi</string>
-    <string name="cpp_wizard_layout_big_buttons">Büyük butonlar</string>
    <string name="cpp_wizard_mode_simple">Basit</string>
  <string name="cpp_wizard_mode_simple_description">Temel modda ana ekranda sadece temel işlevler kullanılabilir.
 Sonuç 5 basamağa kadar yuvarlandı, varsayılan açı birimi olarak derece kullanıldı.</string>
@ -15,21 +13,14 @@ Sonuç 5 basamağa kadar yuvarlandı, varsayılan açı birimi olarak derece kul
    <string name="cpp_wizard_dragbutton_action_end">Mükemmel! Yeniden denemek için bir kez daha dokunun</string>
    <string name="cpp_wizard_dragbutton_action_center">9 için bir kez dokunun</string>
    <string name="cpp_wizard_dragbutton_action_up">%\'yi kullanmak için butonun merkezinden yukarı sürükleyin</string>
-    <string name="cpp_wizard_dragbutton_action_left">sin\'i kullanmak için butonun merkezinden sola sürükleyin</string>
    <string name="cpp_wizard_dragbutton_action_down">^2\'yi kullanmak için butonun merkezinden aşağı sürükleyin</string>
    <string name="cpp_wizard_welcome_title">Hoş geldiniz</string>
-    <string name="cpp_wizard_layout_title">Yerleşim planı seç</string>
    <string name="cpp_wizard_mode_title">Modu seçin</string>
    <string name="cpp_wizard_theme_title">tema seç</string>
    <string name="cpp_wizard_onscreen_calculator_title">Ayrı bir pencerede hesap makinesi</string>
    <string name="cpp_wizard_dragbutton_title">Buton kaydırma temelleri</string>
    <string name="cpp_wizard_final_done">Bu program ayarlandı ve kullanıma hazır.</string>
    <string name="cpp_wizard_final_title">Neredeyse bitti!</string>
-    <string name="cpp_wizard_final_free_and_opensource">Calculator++ ücretsiz ve açık kaynaklı bir uygulamadır: hiç bir özellik ücret talep etmez ve kaynak kodları github üzerinden bulunabilir.</string>
-    <string name="cpp_wizard_final_ways_to_help">Bu uygulamayı daha iyi bir hale getirmek için birkaç yol mevcut:</string>
-    <string name="cpp_wizard_final_donate">Para bağışlama</string>
-    <string name="cpp_wizard_final_translate">Çevriliyor</string>
-    <string name="cpp_wizard_final_contribute">Kaynak kodlarına katkıda bulunmak için</string>
    <string name="cpp_wizard_onscreen_description">Ayrı pencerede açılabilen hesap makinesi size diğer uygulamaları kullanırken de hesap yapabilme imkanı tanır</string>
    <string name="cpp_wizard_onscreen_checkbox">Etkinleştir</string>
    <string name="cpp_wizard_dragbutton_description">Swipe butonu, Calculator++\'ın ikincil fonksiyonlara hızlı erişim sağlayan seçkin bir özelliğidir</string>
--- a/app/src/main/res/values-uk/text_strings.xml
+++ b/app/src/main/res/values-uk/text_strings.xml
@ -57,8 +57,6 @@
    <string name="p_grouping_separator_space">Пробіл ( )</string>
    <string name="c_calc_grouping_separator">Роздільник розрядів</string>
    <string name="c_calc_grouping_separator_summary">Задає роздільник розрядів</string>
-    <string name="p_layout_calculator">Наукова</string>
-    <string name="p_layout_simple">Проста</string>
    <string name="not_valid_result">Поточний результат не допустимий!</string>
    <string name="c_use">Використовувати</string>
    <string name="c_copy_expression">Копіювати вираз</string>
@ -104,37 +102,19 @@
    <string name="open_onscreen_calculator">Клацніть, щоб відкрити калькулятор у віконному режимі</string>
    <string name="prefs_onscreen_title">Параметри Калькулятор++ (в окремому вікні)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Запускати під час завантаження системи</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Якщо увімкнено, то Калькулятор++ з\'явиться на панелі сповіщень після завантаження системи</string>
    <string name="prefs_onscreen_show_app_icon_title">Показувати окрему піктограму (потрібне перевантаження)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Якщо увімкнено, то окрема піктограма появиться у списку програм</string>
    <string name="cpp_this_change_may_require_reboot">Ця зміна може вимагати перезавантаження</string>
    <string name="cpp_plotter">Графобудівник функцій</string>
    <string name="cpp_plot_function_line_color">Колір лінії</string>
-    <string name="cpp_plot_function_line_style">Стиль лінії</string>
    <string name="cpp_plot_function_line_width">Ширина лінії</string>
-    <string name="cpp_plot_function_settings">Налаштування функцій</string>
-    <string name="cpp_function">Функція</string>
-    <string name="cpp_pinned">Закріплені</string>
-    <string name="cpp_visible">Видима</string>
    <string name="cpp_plot_button_text">+графік</string>
    <string name="cpp_plot_empty_function_error">Не вдалося відобразити пусту функцію!</string>
    <string name="cpp_plot_too_many_variables">Не вдалося відобразити: занадто багато змінних!</string>
    <string name="cpp_plot_range">Діапазон графіка</string>
-    <string name="cpp_fullscreen">Повноекранний режим</string>
-    <string name="cpp_plot_range_x_min">X мін</string>
-    <string name="cpp_plot_range_x_max">X макс</string>
-    <string name="cpp_plot_range_y_min">Y мин</string>
-    <string name="cpp_plot_range_y_max">Y макс</string>
-    <string name="cpp_invalid_number">Неприпустиме значення!</string>
-    <string name="cpp_plot_boundaries_should_differ">Границі графіку не повинні бути однаковими!</string>
-    <string name="cpp_apply">Застосувати</string>
-    <string name="cpp_message">Повідомлення</string>
    <string name="cpp_continue">Продовжити</string>
    <string name="cpp_purchase_text">Підтримка проекту - це легко та безпечно: процес покупки контролюється Google і все, що вам необхідно це належним чином налаштувати профіль Google.\n\n Інформація про оплату зберігається на серверах Google з вашим обліковим записом 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">Очистити історію?</string>
    <string name="cpp_clear_history_message">Очищено усю історію.</string>
    <string name="cpp_clear_history">Очистити</string>
--- a/app/src/main/res/values-uk/text_vars.xml
+++ b/app/src/main/res/values-uk/text_vars.xml
@ -14,9 +14,6 @@
  <string name="c_var_description_G">Гравітаційна константа - емпірична фізична стала, необхідна для розрахунку сили
 		гравітаційної взаємодії між двома об’єктами з масою, м^3·кг^−1·с^−2
 	</string>
-  <string name="c_var_description_h">Константа Планка - коефіцієнт, який пов’язує величину енергії електромагнітного
-		випромінюювання з його частотою, Дж·с
-	</string>
    <string name="c_var_description_h_reduced">Зведена константа Планка, Дж·с</string>
    <string name="c_var_description_nan">Не число</string>
    <string name="c_var_description_inf">Нескінченність</string>
--- a/app/src/main/res/values-uk/text_wizard.xml
+++ b/app/src/main/res/values-uk/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
    <string name="cpp_wizard_mode_simple_description">У простому режимі лише базові функціональні можливості будуть доступні з головного екрана.   Результат округлюється до 5 цифр, одиниці вимірювання кутів - градуси.</string>
    <string name="cpp_wizard_mode_engineer">Інженерний</string>
@ -14,21 +12,14 @@
    <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_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>
    <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>
-    <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">Калькулятор в окремому вікні - дає змогу виконувати розрахунки під час використання інших програм на вашому пристрої</string>
    <string name="cpp_wizard_onscreen_checkbox">Увімкнути</string>
    <string name="cpp_wizard_dragbutton_description">Кнопки зсуву є винятковою рисою Калькулятор++, які забезпечують швидкий доступ до додаткових функцій</string>
--- a/app/src/main/res/values-vi/text_strings.xml
+++ b/app/src/main/res/values-vi/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Space ( )</string>
    <string name="c_calc_grouping_separator">Nhóm tách</string>
    <string name="c_calc_grouping_separator_summary">Bộ nhóm tách</string>
-    <string name="p_layout_calculator">Khoa học</string>
-    <string name="p_layout_simple">Đơn giản</string>
    <string name="not_valid_result">Kết quả hiện tại là không hợp lệ!</string>
    <string name="c_use">Sử dụng</string>
    <string name="c_copy_expression">Sao chép biểu thức</string>
@ -98,39 +96,21 @@
    <string name="open_onscreen_calculator">Bấm để mở máy tính trong chế độ cửa sổ</string>
    <string name="prefs_onscreen_title">Cài đặt máy tính (trong cửa sổ riêng biệt)</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">Bắt đầu khi khởi động</string>
-    <string name="prefs_onscreen_start_on_boot_summary">Nếu bật máy tính ++ sẽ xuất hiện trong thanh thông báo sau khi khởi động thiết bị</string>
    <string name="prefs_onscreen_show_app_icon_title">Hiển thị biểu tượng riêng biệt (yêu cầu khởi động lại)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Nếu bật biểu tượng thứ hai sẽ được hiển thị trong danh sách ứng dụng</string>
    <string name="cpp_this_change_may_require_reboot">Sự thay đổi này có thể yêu cầu khởi động lại</string>
    <string name="cpp_plotter">Chức năng plotter</string>
    <string name="cpp_plot_function_line_color">Màu đường</string>
-    <string name="cpp_plot_function_line_style">Kiểu đường</string>
    <string name="cpp_plot_function_line_width">Độ rộng đường</string>
-    <string name="cpp_plot_function_settings">Cài đặt hàm</string>
-    <string name="cpp_function">Chức năng</string>
-    <string name="cpp_pinned">Đã ghim</string>
-    <string name="cpp_visible">Hiển thị</string>
    <string name="cpp_plot_button_text">+plot</string>
    <string name="cpp_plot_empty_function_error">Không thể vẽ hàm rỗng!</string>
    <string name="cpp_plot_too_many_variables">Không thể vẽ: quá nhiều biến!</string>
    <string name="cpp_plot_range">Phạm vi biểu đồ</string>
-    <string name="cpp_fullscreen">Toàn màn hình</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">Số không hợp lệ!</string>
-    <string name="cpp_plot_boundaries_should_differ">Giới hạn đồ thị không không được trùng!</string>
-    <string name="cpp_apply">Áp dụng</string>
-    <string name="cpp_message">Tin nhắn</string>
    <string name="cpp_continue">Tiếp tục</string>
  <string name="cpp_purchase_text">Hỗ trợ dự án là dễ dàng và an toàn: tiến trình mua được cung cấp bởi Google và tất cả các bạn cần có tài khoản Google.\n\n
 Thông tin thanh toán được lưu trên các máy chủ Google với tài khoản Google của bạn và bạn dễ dàng sử dụng úng dụng này trên vài thiết bị.\n\n
 Qua việc click nút \'Tiếp tục\' bạn được chuyển qua úng dụng Google Play để thực hiện thanh toán.</string>
    <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">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>
--- a/app/src/main/res/values-vi/text_vars.xml
+++ b/app/src/main/res/values-vi/text_vars.xml
@ -6,7 +6,6 @@
    <string name="c_var_description_i">Đơn vị ảo, được định nghĩa như i^ 2 = −1</string>
    <string name="c_var_description_c">Tốc độ của ánh sáng trong chân không, m·s</string>
    <string name="c_var_description_G">Hằng số hấp dẫn là một hằng số vật lý thực nghiệm liên quan đến việc tính hấp dẫn giữa các đối tượng với khối lượng, m ^ 3·kg ^ −1·s ^ −2</string>
-    <string name="c_var_description_h">Hằng số vật lý phản ánh các kích thước của lượng tử trong cơ học lượng tử, J·s</string>
    <string name="c_var_description_h_reduced">Hằng số giảm Planck, J·s</string>
    <string name="c_var_description_nan">Không phải một số</string>
    <string name="c_var_description_inf">Vô cực</string>
--- a/app/src/main/res/values-vi/text_wizard.xml
+++ b/app/src/main/res/values-vi/text_wizard.xml
@ -4,8 +4,6 @@
    <string name="cpp_wizard_back">Trở lại</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>
    <string name="cpp_wizard_mode_simple_description">Trong chế độ đơn giản chỉ chức năng cơ bản sẽ có sẵn từ màn hình chính. Kết quả làm tròn lên đến 5 chữ số, độ được sử dụng như là các đơn vị góc mặc định.</string>
    <string name="cpp_wizard_mode_engineer">Kỹ sư</string>
@ -14,21 +12,14 @@
    <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">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">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>
-    <string name="cpp_wizard_final_donate">Quyên góp tiền</string>
-    <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">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>
--- a/app/src/main/res/values-zh-rCN/text_strings.xml
+++ b/app/src/main/res/values-zh-rCN/text_strings.xml
@ -55,8 +55,6 @@
    <string name="p_grouping_separator_space">空格 ( )</string>
    <string name="c_calc_grouping_separator">分节符</string>
    <string name="c_calc_grouping_separator_summary">设置分节符</string>
-    <string name="p_layout_calculator">科学型</string>
-    <string name="p_layout_simple">简单型</string>
    <string name="not_valid_result">当前结果无效！</string>
    <string name="c_use">使用</string>
    <string name="c_copy_expression">复制算式</string>
@ -99,37 +97,19 @@
    <string name="open_onscreen_calculator">单击以在悬浮窗口中打开计算器</string>
    <string name="prefs_onscreen_title">悬浮计算器设置</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">开机启动</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="cpp_this_change_may_require_reboot">此更改可能需要重新启动</string>
    <string name="cpp_plotter">函数绘图仪</string>
    <string name="cpp_plot_function_line_color">线条颜色</string>
-    <string name="cpp_plot_function_line_style">线条样式</string>
    <string name="cpp_plot_function_line_width">线条宽度</string>
-    <string name="cpp_plot_function_settings">函数设置</string>
-    <string name="cpp_function">函数</string>
-    <string name="cpp_pinned">已固定</string>
-    <string name="cpp_visible">可见</string>
    <string name="cpp_plot_button_text">+ 绘制</string>
    <string name="cpp_plot_empty_function_error">无法绘制空函数 ！</string>
    <string name="cpp_plot_too_many_variables">无法绘制：变量太多！</string>
    <string name="cpp_plot_range">图表范围</string>
-    <string name="cpp_fullscreen">全屏</string>
-    <string name="cpp_plot_range_x_min">X 最小值</string>
-    <string name="cpp_plot_range_x_max">X 最大值</string>
-    <string name="cpp_plot_range_y_min">Y 最小值</string>
-    <string name="cpp_plot_range_y_max">Y 最大值</string>
-    <string name="cpp_invalid_number">无效的数字！</string>
-    <string name="cpp_plot_boundaries_should_differ">图形边界不应该相同！</string>
-    <string name="cpp_apply">应用</string>
-    <string name="cpp_message">消息</string>
    <string name="cpp_continue">继续</string>
    <string name="cpp_purchase_text">支持该项目是很容易和安全的： 购买过程由谷歌提供,你只需要正确配置 Google 账户.\n\n 付款信息存储在 Google 的服务器与您的 Google 帐户中,您可以在几个设备轻松使用此应用程序.\n\n 通过单击继续按钮，您将被重定向到谷歌商店来进行支付。</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">清除历史纪录？</string>
    <string name="cpp_clear_history_message">所有历史将被清除</string>
    <string name="cpp_clear_history">清除</string>
--- a/app/src/main/res/values-zh-rCN/text_vars.xml
+++ b/app/src/main/res/values-zh-rCN/text_vars.xml
@ -6,7 +6,6 @@
    <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_h_reduced">约化普朗克常数，单位为J·s</string>
    <string name="c_var_description_nan">非数字</string>
    <string name="c_var_description_inf">无穷大</string>
--- a/app/src/main/res/values-zh-rCN/text_wizard.xml
+++ b/app/src/main/res/values-zh-rCN/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
    <string name="cpp_wizard_mode_simple_description">在简单模式下主屏幕上只有基本功能可用。计算结果保留5位小数，角度单位默认为度。</string>
    <string name="cpp_wizard_mode_engineer">工程模式</string>
@ -14,21 +12,14 @@
    <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_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>
    <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>
-    <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">独立窗口模式的计算器可以让你在使用其他应用程序的同时进行计算。</string>
    <string name="cpp_wizard_onscreen_checkbox">启用</string>
    <string name="cpp_wizard_dragbutton_description">滑动输入是Calculator++的独特创意，它可提高你调用次要功能的效率</string>
--- a/app/src/main/res/values-zh-rTW/text_strings.xml
+++ b/app/src/main/res/values-zh-rTW/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">空格 ( )</string>
    <string name="c_calc_grouping_separator">撇節符號</string>
    <string name="c_calc_grouping_separator_summary">設定撇節符號</string>
-    <string name="p_layout_calculator">科學模式</string>
-    <string name="p_layout_simple">簡單模式</string>
    <string name="not_valid_result">目前計算结果無效！</string>
    <string name="c_use">使用</string>
    <string name="c_copy_expression">複製算式</string>
@ -98,39 +96,21 @@
    <string name="open_onscreen_calculator">點擊以視窗模式開啟計算機</string>
    <string name="prefs_onscreen_title">計算機（獨立視窗）設定</string>
    <string name="prefs_widget_title">Widget settings</string>
-    <string name="prefs_onscreen_start_on_boot_title">開機時啟動</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="cpp_this_change_may_require_reboot">這個變動可能需要重新啟動</string>
    <string name="cpp_plotter">函數繪圖工具</string>
    <string name="cpp_plot_function_line_color">線條顏色</string>
-    <string name="cpp_plot_function_line_style">線條樣式</string>
    <string name="cpp_plot_function_line_width">線條寬度</string>
-    <string name="cpp_plot_function_settings">函數設定</string>
-    <string name="cpp_function">函數</string>
-    <string name="cpp_pinned">已固定</string>
-    <string name="cpp_visible">可看見</string>
    <string name="cpp_plot_button_text">+繪製</string>
    <string name="cpp_plot_empty_function_error">無法繪製空白函數！</string>
    <string name="cpp_plot_too_many_variables">無法繪製：太多變數！</string>
    <string name="cpp_plot_range">圖形範圍</string>
-    <string name="cpp_fullscreen">全螢幕</string>
-    <string name="cpp_plot_range_x_min">X 最小值</string>
-    <string name="cpp_plot_range_x_max">X 最大值</string>
-    <string name="cpp_plot_range_y_min">Y 最小值</string>
-    <string name="cpp_plot_range_y_max">Y 最大值</string>
-    <string name="cpp_invalid_number">數目無效！</string>
-    <string name="cpp_plot_boundaries_should_differ">圖形邊界不應該相同！</string>
-    <string name="cpp_apply">套用</string>
-    <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>
    <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">清除歷史紀錄？</string>
    <string name="cpp_clear_history_message">所有歷史紀錄將被清除。</string>
    <string name="cpp_clear_history">清除</string>
--- a/app/src/main/res/values-zh-rTW/text_vars.xml
+++ b/app/src/main/res/values-zh-rTW/text_vars.xml
@ -6,7 +6,6 @@
    <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_h_reduced">約化普朗克常數，J·s</string>
    <string name="c_var_description_nan">非數</string>
    <string name="c_var_description_inf">無窮大</string>
--- a/app/src/main/res/values-zh-rTW/text_wizard.xml
+++ b/app/src/main/res/values-zh-rTW/text_wizard.xml
@ -4,8 +4,6 @@
    <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>
  <string name="cpp_wizard_mode_simple_description">在簡單模式下，主畫面上只有基本功能可以使用。
 計算結果四捨五入，角度單位預設為 度(Degrees)。
@ -18,23 +16,14 @@
    <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_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>
    <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>
-    <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">獨立視窗的計算機讓你在使用其他應用程式時能夠同時計算。
 	</string>
    <string name="cpp_wizard_onscreen_checkbox">啟用</string>
--- a/app/src/main/res/values/text_strings.xml
+++ b/app/src/main/res/values/text_strings.xml
@ -54,8 +54,6 @@
    <string name="p_grouping_separator_space">Space ( )</string>
    <string name="c_calc_grouping_separator">Grouping separator</string>
    <string name="c_calc_grouping_separator_summary">Sets grouping separator</string>
-    <string name="p_layout_calculator">Scientific</string>
-    <string name="p_layout_simple">Simple</string>
    <string name="not_valid_result">Current result is not valid!</string>
    <string name="c_use">Use</string>
    <string name="c_copy_expression">Copy expression</string>
@ -102,32 +100,16 @@
    <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_widget_title">Widget 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_plotter">Function plotter</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
@ -136,8 +118,6 @@
 		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>
    <string name="cpp_show_greek_keyboard" translatable="false">αβγ</string>
-    <string name="cpp_var_show_greek_keyboard">Show Greek letters</string>
-    <string name="cpp_var_hide_greek_keyboard">Hide Greek letters</string>
    <string name="cpp_clear_history_title">Clear history?</string>
    <string name="cpp_clear_history_message">All history will be cleared.</string>
    <string name="cpp_clear_history">Clear</string>
--- a/app/src/main/res/values/text_vars.xml
+++ b/app/src/main/res/values/text_vars.xml
@ -6,7 +6,6 @@
    <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">Not a number</string>
    <string name="c_var_description_inf">Infinity</string>
--- a/app/src/main/res/values/text_wizard.xml
+++ b/app/src/main/res/values/text_wizard.xml
@ -4,8 +4,6 @@
    <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.
@ -20,24 +18,14 @@
    <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_onscreen_description">Calculator in separate window allows you to do calculations while
 		using other apps on your device
 	</string>
--- a/app/src/main/res/values/vpi__defaults.xml
+++ b/app/src/main/res/values/vpi__defaults.xml
@ -13,7 +13,7 @@
     limitations under the License.
 -->

-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
    <bool name="default_circle_indicator_centered">true</bool>
    <color name="default_circle_indicator_fill_color">#FFFFFFFF</color>
    <color name="default_circle_indicator_page_color">#00000000</color>