diff --git a/android-app/src/main/res/values-ar/text_strings.xml b/android-app/src/main/res/values-ar/text_strings.xml
index ab7eea66..4b80c352 100644
--- a/android-app/src/main/res/values-ar/text_strings.xml
+++ b/android-app/src/main/res/values-ar/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">الآلة الحاسبة++</string>
   <string name="c_app_name_on_screen">الآلة الحاسبة++ (نمط النافذة)</string>
-  <string name="c_app_icon_name">الحاسبة++</string>
   <string name="c_app_settings">الإعدادات</string>
-  <string name="c_syntax_error">خطأ</string>
   <string name="c_result_copied">تم نسخ النتيجة الى الحافظة!</string>
   <string name="c_settings">الإعدادات</string>
   <string name="c_help">المساعدة</string>
   <string name="c_vars_and_constants">المتغيرات والثوابت</string>
-  <string name="c_prefs_main_category">الإعدادات الرئيسية</string>
   <string name="c_prefs_calculations_category">إعدادات الحساب</string>
   <string name="c_prefs_appearance_category">إعدادات المظهر</string>
   <string name="c_prefs_other_category">إعدادات أخرى</string>
-  <string name="c_prefs_drag_button_category">إعدادات أزرار السحب</string>
-  <string name="c_down">للأسفل</string>
-  <string name="c_up">للأعلى</string>
-  <string name="c_restart">إعادة تشغيل</string>
   <string name="c_undo">تراجع</string>
   <string name="c_redo">إعادة الفعل</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">لصق</string>
   <string name="c_vars">المتغيرات</string>
   <string name="c_copy">نسخ</string>
   <string name="c_plot">رسم الدالّة</string>
@@ -37,7 +29,6 @@
   <string name="p_calc_max_calculation_time_title">الحد الأقصى لوقت الحساب</string>
   <string name="p_calc_max_calculation_time_summary">إذا كانت الحسابات تتجاوز الحد المعين - ستتوقف الآلة الحاسبة مع وجود خطأ</string>
   <string name="c_exit">خروج</string>
-  <string name="c_add">إضافة</string>
   <string name="c_cancel">إلغاء الأمر</string>
   <string name="c_save">حفظ</string>
   <string name="c_remove">إزالة</string>
@@ -54,14 +45,9 @@
   <string name="c_var_name_clashes">اسم المتغير يتشابك مع اسم الدالة!</string>
   <string name="c_var_already_exists">متغير يحمل نفس الاسم موجود مسبقاً!</string>
   <string name="c_name_is_not_valid">اسم الثابت غير صحيح: الاسم يجب أن يبدأ بحرف, ويمكن أن يحتوي على أحرف وأرقام و إشارة _ .</string>
-  <string name="c_sys_var_cannot_be_changed">لا بمكن القيام بتغييرات على متغير النظام!</string>
   <string name="c_calc_editor_hint">أدخل معادلة جديدة</string>
-  <string name="c_press_to_copy">اضغط للنسخ</string>
-  <string name="c_continue">متابعة</string>
   <string name="c_history">السجل</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">السجل فارغ!</string>
-  <string name="c_app_history">السجل</string>
   <string name="c_char_is_not_accepted">المحرف \'%s\' غير مقبول في اسم المتغير!</string>
   <string name="c_calc_angle_units">واحدة الزاوية الحالية</string>
   <string name="p_deg">درجات</string>
@@ -76,18 +62,15 @@
   <string name="p_oct">ثماني</string>
   <string name="p_bin">ثنائي</string>
   <string name="c_calc_theme">السيمة</string>
-  <string name="p_default_theme">رمادي</string>
-  <string name="p_violet_theme">بنفسجي</string>
-  <string name="p_light_blue_theme">أزرق فاتح</string>
-  <string name="p_metro_blue_theme">المترو الأزرق (الإفتراضي)</string>
+  <string name="p_metro_blue_theme">المترو الأزرق</string>
   <string name="p_metro_green_theme">المترو الأخضر</string>
   <string name="p_metro_purple_theme">المترو الأرجواني</string>
+  <string name="p_material_theme">المواد</string>
+  <string name="p_material_light_theme">المواد الخفيفة</string>
   <string name="c_calc_result_precision_summary">دقة قيمة النتيجة (الحسابات كافة تتم بأقصى قدر من الدقة بغض النظر عن قيمة هذا الخيار)</string>
   <string name="c_calc_color_display_summary">تبديل التلوين والتصميم في معدّل الآلة الحاسبة</string>
   <string name="c_calc_theme_summary">حدد تصميم الآلة الحاسبة</string>
-  <string name="c_clear_history">مسح سجل المحفوظات</string>
   <string name="c_toggle_datetime">إظهار/إخفاء التاريخ</string>
-  <string name="c_simplify_instead_of_numeric">الثوابت التالية غير معرّفة: {0}!</string>
   <string name="p_grouping_separator_no">بلا فاصل</string>
   <string name="p_grouping_separator_apostrophe">فاصلة عليا (\')</string>
   <string name="p_grouping_separator_space">مسافة ( )</string>
@@ -96,7 +79,6 @@
   <string name="c_calc_multiplication_sign">علامة الضرب</string>
   <string name="c_calc_multiplication_sign_summary">تضع علامة ضرب</string>
   <string name="c_calc_layout">التصميم</string>
-  <string name="p_layout_cellphone">علمية (هاتف محمول)</string>
   <string name="p_layout_calculator">علمية</string>
   <string name="p_layout_calculator_mobile">علمية (بأزرار كبيرة)</string>
   <string name="p_layout_simple">بسيطة</string>
@@ -104,30 +86,21 @@
   <string name="c_calc_layout_summary">حدد تصميم الأزرار</string>
   <string name="c_calc_haptic_feedback_title">اهتزاز عند نقر الأزرار</string>
   <string name="c_calc_haptic_feedback_summary">إهتزاز عند النقر على الزر</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">معطل</string>
   <string name="p_calc_haptic_feedback_strength_short">قصير</string>
   <string name="p_calc_haptic_feedback_strength_middle">متوسط</string>
   <string name="p_calc_haptic_feedback_strength_long">طويل</string>
-  <string name="p_calc_haptic_feedback_duration_title">مدّة اهتزاز الأزرار</string>
-  <string name="p_calc_haptic_feedback_duration_summary">مدة الاهتزاز عند نقر الزر</string>
   <string name="empty_var_error">غير قادر على إنشاء ثابت فارغ!</string>
   <string name="not_valid_result">النتيجة الحالية غير صالحة!</string>
   <string name="c_plot_graph">رسم بياني</string>
   <string name="c_min_x_value">من</string>
   <string name="c_max_x_value">الى</string>
-  <string name="c_swipe_distance">مسافة السحب الخاصة بالأزرار</string>
-  <string name="c_swipe_distance_summary">حدد مسافة السحب على الأزرار التي تحوي ميزات سحب إضافية</string>
-  <string name="c_comment">تعليق</string>
-  <string name="c_history_item_saved">محفوظ</string>
-  <string name="c_history_item_not_saved">غير محفوظ</string>
   <string name="c_expression_copied">المعادلة نسخت الى الحافظة!</string>
-  <string name="c_history_item_status">الحالة:</string>
-  <string name="c_history_item_comment">تعليق:</string>
   <string name="c_use">استخدم</string>
   <string name="c_use_short">استخدم</string>
   <string name="c_copy_expression">نسخ المعادلة</string>
   <string name="c_copy_result">نسخ النتيجة</string>
   <string name="c_history_expression">القيمة</string>
-  <string name="c_history_item_already_saved">تم الحفظ (راجع \'سجل المحفوظات\')</string>
   <string name="c_history_comment">تعليق</string>
   <string name="c_save_history">سجل المحفوظات</string>
   <string name="c_edit_history">سجل التعديلات</string>
@@ -140,7 +113,6 @@
   <string name="c_copy_description">نسخ الوصف</string>
   <string name="c_copy_value">نسخ القيمة</string>
   <string name="c_first_start_text">شكراً لك لاخيار الآلة الحاسبة++!\n\nالآلة الحاسبة++ هي أداة قوية لإجراء العمليات الحسابية اليومية.</string>
-  <string name="c_first_start_text_title">أهلا</string>
   <string name="c_calc_show_release_notes_title">إظهار ملاحظات الإصدار</string>
   <string name="c_calc_show_release_notes_summary">يعرّف إذا كان يجب أن تظهر نافذة ملاحظات الإصدار بعد التحديث إلى الإصدار الجديد</string>
   <string name="c_calc_use_back_button_as_prev_summary">يحدد كيفية عمل زر الرجوع</string>
@@ -153,16 +125,10 @@
   <string name="c_calc_ad_free_title">دعم المشروع</string>
   <string name="c_calc_ad_free_summary">وإزالة الإعلان</string>
   <string name="c_calc_already_purchased">خيار إخفاء الإعلانات مدفوع مسبقاً!</string>
-  <string name="c_calc_purchasing">جاري الشراء&#8230;</string>
-  <string name="c_calc_clearing">جاري المسح&#8230;</string>
-  <string name="c_feedback_title">التعليقات</string>
   <string name="c_feedback_text">أصبح لك مدة تستخدم الآلة الحاسبة++\n
 و إنه من المهم لنا أن نعرف رأيك الشخصي حول التطبيق.\n\n
 رجاء قم بتقييم الآلة الحاسبة++ \nعلى<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 سوق بلاي</a>,\n أترك تعليقاً أو \n ناقش حول البرنامج \nعلى<a href="http://facebook.com/calculatorpp">فيس بوك</a></string>
-  <string name="c_notespp_announce_text">أخبار جيدة - لقد أصدرت تطبيقاً جديداً للأندرويد يدعى
-<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">نوت++</a>.\n
-إذا كنت مهتماً بكتابة سريعة وسهلة لملاحظاتك رجاء إضغط <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">الرابط</a> وجرب نوت++!</string>
   <string name="c_angle_units_changed_to">تم تغيير واحدة الزوايا الى \'%s\'!</string>
   <string name="c_numeral_base_changed_to">تم تغيير الأساس العددي الى \'%s\'!</string>
   <string name="c_conversion_tool">أداة التحويل</string>
@@ -175,17 +141,7 @@
   <string name="other">الأخرى</string>
   <string name="derivatives">المشتقات/التكاملات</string>
   <string name="crashed">الآلة حاسبة++ توقفت عن العمل&#8230;</string>
-  <string name="crash_dialog_title">آلة حاسبة++ تقرير الحادث</string>
-  <string name="crash_dialog_text">  لسوء الحظ, لقد توقفت الآلة الحاسبة++ عن العمل.\n\n
-من أجل إصلاح المشكلة نحن بحاجة إلى بعض المعلومات حول هذا الموضوع. ينصح بإرسال تقرير عن توقف التطبيق عن العمل عبر البريد الإلكتروني (بعد الضغط على زر \'موافق\' سترى كافة البيانات المرسلة في نافذة جديدة).\n\n
-هل تريد إرسال تقرير عن توقف عملها؟</string>
   <string name="prefs_graph_screen_title">إعدادات الرسم البياني</string>
-  <string name="prefs_graph_interpolate_function">أضف الرسم البياني للدالّة</string>
-  <string name="prefs_graph_interpolate_function_summary">إذا كان الخيار فعال سيكون الرسم البياني ثلاثي الأبعاد مستخدما في رسم الدوال</string>
-  <string name="prefs_graph_real_color_title">لون الجزء الحقيقي من الرسم البياني للدالّة</string>
-  <string name="prefs_graph_real_color_summary">حدد لون الجزء الحقيقي من الرسم البياني للدالّة</string>
-  <string name="prefs_graph_imag_color_title">لون الجزء التخيلي للرسم البياني للدوال</string>
-  <string name="prefs_graph_imag_color_summary">حدد لون الجزء التخيلي للرسم البياني للدوال</string>
   <string name="p_white_line_color">أبيض</string>
   <string name="p_grey_line_color">رمادي</string>
   <string name="p_red_line_color">أحمر</string>
@@ -205,7 +161,6 @@
   <string name="empty_function_error">غير قادر على إنشاء دالّة فارغة!</string>
   <string name="do_not_show_messages_in_session">عدم إظهار هذه الرسالة حتى الدورة القادمة</string>
   <string name="calculation_messages_dialog_title">تحذير الآلة الحاسبة++</string>
-  <string name="arithmetic_error_while_plot">حدث خطأ حسابي أثناء رسم: %s</string>
   <string name="ok">موافق</string>
   <string name="p_show_calculation_messages_dialog_title">إظهار رسائل عمليات الحساب في مربع الحوار</string>
   <string name="p_show_calculation_messages_dialog_summary">إذا كان الخيار فعال ستظهر مربع حوار خاص لعرض الرسائل التي تظهر أثناء إجراء العمليات الحسابية</string>
@@ -227,7 +182,6 @@
   <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_onscreen_remove_icon_message">يمكنك إزالة الأيقونة الثانية في قائمة التطبيقات من إعدادات التطبيق أو عن طريق الضغط على الزر التالي</string>
   <string name="cpp_this_change_may_require_reboot">قد يتطلب هذا التغيير إعادة تشغيل</string>
   <string name="cpp_plot_2d">رسم ثنائي أبعاد</string>
   <string name="cpp_plot_3d">رسم ثلاثي أبعاد</string>
@@ -270,8 +224,11 @@
 تفاصيل الدفع مخزنة في خوادم غوغل مع حساب غوغل الخاص بك و يمكنك بسهولة استخدام هذا التطبيق على عدة أجهزة.\n\n
 عند النقر فوق زر \'متابعة\' سيتم إعادة توجيهك إلى التطبيق سوق غوغل لتقوم بالدفع.</string>
   <string name="cpp_purchase_title">الشراء</string>
-  <string name="cpp_purchase_thank_you_text">شكرا لك على دعم هذا التطبيق!\n\n قد يستغرق الأمر عدة دقائق حتى يصبح التطبيق مزود بمعلومات الشراء. يمكنك دائماً مراجعة المعلومات حول الشراء في حساب غوغل الخاص بك.\n
-إذا كان لديك أي مشاكل أو أسئلة لا تتردد في الإتصال بي مباشرة (تتوفر جهات الإتصال في القائمة-&gt;الرئيسية-&gt;حول)</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>
+  <string name="cpp_new_in_version">الجديد في الإصدار %1$s</string>
+  <string name="cpp_release_notes_choose_theme">هل تريد محاولة المواضيع المادية الجديدة؟ اختر منهم من القائمة:</string>
 </resources>
diff --git a/android-app/src/main/res/values-cs/text_strings.xml b/android-app/src/main/res/values-cs/text_strings.xml
index 463d24cd..8d3efd9e 100644
--- a/android-app/src/main/res/values-cs/text_strings.xml
+++ b/android-app/src/main/res/values-cs/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Kalkulačka ++ (Režim okna)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Nastavení</string>
-  <string name="c_syntax_error">Chyba</string>
   <string name="c_result_copied">Výsledek byl zkopírován do schránky!</string>
   <string name="c_settings">Nastavení</string>
   <string name="c_help">Pomoc</string>
   <string name="c_vars_and_constants">Proměnné a Konstanty</string>
-  <string name="c_prefs_main_category">Hlavní nastavení</string>
   <string name="c_prefs_calculations_category">Nastavení výpočtu</string>
   <string name="c_prefs_appearance_category">Nastavení Vzhledu</string>
   <string name="c_prefs_other_category">Další nastavení</string>
-  <string name="c_prefs_drag_button_category">Nastavení tahání na tlačítkach</string>
-  <string name="c_down">Dolů</string>
-  <string name="c_up">Nahoru</string>
-  <string name="c_restart">Restartovat</string>
   <string name="c_undo">Zpět</string>
   <string name="c_redo">Vpřed</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">Vložit</string>
   <string name="c_vars">proměnné</string>
   <string name="c_copy">Kopírovat</string>
   <string name="c_plot">Vykreslit graf</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Maximální čas počítání</string>
   <string name="p_calc_max_calculation_time_summary">Pokud výpočty překročí zadaný limit - kalkulačka ukončí s chybou</string>
   <string name="c_exit">Opustit</string>
-  <string name="c_add">Přidat</string>
   <string name="c_cancel">Zavřít</string>
   <string name="c_save">Uložit</string>
   <string name="c_remove">Odstranit</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Název proměnné se rovná názvu funkce!</string>
   <string name="c_var_already_exists">Proměnná se stejným názvem již existuje!</string>
   <string name="c_name_is_not_valid">Název konstanty není platný: jméno musí začínat písmenem, může obsahovat písmena, číslice a podtržítka.</string>
-  <string name="c_sys_var_cannot_be_changed">Systémové proměnné nelze změnit!</string>
   <string name="c_calc_editor_hint">Vlož nový výraz</string>
-  <string name="c_press_to_copy">Stiskni pro skopírování</string>
-  <string name="c_continue">Pokračovat</string>
   <string name="c_history">Historie</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Historie je prázdná!</string>
-  <string name="c_app_history">Historie</string>
   <string name="c_char_is_not_accepted">Znak \'%s\' není povolen v názvu proměnné!</string>
   <string name="c_calc_angle_units">Aktuální jednotky úhlu</string>
   <string name="p_deg">Stupňů</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Osmičková</string>
   <string name="p_bin">Binární</string>
   <string name="c_calc_theme">Vzhled</string>
-  <string name="p_default_theme">Šedá</string>
-  <string name="p_violet_theme">Fialová</string>
-  <string name="p_light_blue_theme">Světle modrá</string>
   <string name="p_metro_blue_theme">Metro Modrá</string>
   <string name="p_metro_green_theme">Metro Zelená</string>
   <string name="p_metro_purple_theme">Metro Fialová</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Přesnost výsledku (všechny výpočty jsou prováděny s maximální přesností bez ohledu na tuto hodnotu)</string>
   <string name="c_calc_color_display_summary">Změna barev a stylu v editoru kalkulačky</string>
   <string name="c_calc_theme_summary">Nastaví vzhled pro kalkulačku</string>
-  <string name="c_clear_history">Vymazat historii</string>
   <string name="c_toggle_datetime">Zobrazit nebo skrýt datum</string>
-  <string name="c_simplify_instead_of_numeric">Další konstanty nejsou definovány: {0}!</string>
   <string name="p_grouping_separator_no">Žádný oddělovač skupiny čísel</string>
   <string name="p_grouping_separator_apostrophe">Apostrof (\')</string>
   <string name="p_grouping_separator_space">Mezera ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Znak násobení</string>
   <string name="c_calc_multiplication_sign_summary">Nastavit znak násobení</string>
   <string name="c_calc_layout">Rozložení</string>
-  <string name="p_layout_cellphone">Vědecké (mobil)</string>
   <string name="p_layout_calculator">Vědecké</string>
   <string name="p_layout_calculator_mobile">Vědecké (Velká tlačítka)</string>
   <string name="p_layout_simple">Jednoduché</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Nastavit rozložení tlačítek</string>
   <string name="c_calc_haptic_feedback_title">Haptická odezva</string>
   <string name="c_calc_haptic_feedback_summary">Vibrace při stisknutí talčítka</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Vypnuté</string>
   <string name="p_calc_haptic_feedback_strength_short">Krátké</string>
   <string name="p_calc_haptic_feedback_strength_middle">Střední</string>
   <string name="p_calc_haptic_feedback_strength_long">Dlouhé</string>
-  <string name="p_calc_haptic_feedback_duration_title">Doba trvání haptické odezvy</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Doba vibrace při kliknutí na tlačítko</string>
   <string name="empty_var_error">Nelze vytvořit prázdnou konstantu!</string>
   <string name="not_valid_result">Aktuální výsledek není platný!</string>
   <string name="c_plot_graph">Graf</string>
   <string name="c_min_x_value">Od</string>
   <string name="c_max_x_value">Do</string>
-  <string name="c_swipe_distance">Vzdálenost dotknutí pro tlačítka</string>
-  <string name="c_swipe_distance_summary">Nastavit vzdálenost dotknutí pro tlačítka, která podporují tuto akci</string>
-  <string name="c_comment">Komentář</string>
-  <string name="c_history_item_saved">Uloženo</string>
-  <string name="c_history_item_not_saved">Neuloženo</string>
   <string name="c_expression_copied">Výraz je zkopírován do schránky!</string>
-  <string name="c_history_item_status">Stav:</string>
-  <string name="c_history_item_comment">Komentář:</string>
   <string name="c_use">Použít</string>
   <string name="c_use_short">Použít</string>
   <string name="c_copy_expression">Kopírovat výraz</string>
   <string name="c_copy_result">Kopírovat výsledek</string>
   <string name="c_history_expression">Hodnota</string>
-  <string name="c_history_item_already_saved">Uloženo (viz. Historie uložení)</string>
   <string name="c_history_comment">Komentář</string>
   <string name="c_save_history">Uložit historii</string>
   <string name="c_edit_history">Upravit historii</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Zkopírovat popis</string>
   <string name="c_copy_value">Zkopírovat hodnotu</string>
   <string name="c_first_start_text">Děkujeme vám za používaní Kalkulačky++! \n\nKalkulačka++ je výkonný nástroj pro každodenní kalkulace.</string>
-  <string name="c_first_start_text_title">Vítejte</string>
   <string name="c_calc_show_release_notes_title">Zobrazit poznámky k verzi</string>
   <string name="c_calc_show_release_notes_summary">Definuje jestli okno s poznámkami k nové verzi by se mělo objevit po aktualizaci na novou verzi</string>
   <string name="c_calc_use_back_button_as_prev_summary">Definuje chování tlačítka Zpět</string>
@@ -152,19 +124,12 @@
   <string name="c_calc_ad_free_title">Podpora projektu</string>
   <string name="c_calc_ad_free_summary">A odstranit reklamy</string>
   <string name="c_calc_already_purchased">Bez-reklamní verze již byla zakoupena!</string>
-  <string name="c_calc_purchasing">Nákup&#8230;</string>
-  <string name="c_calc_clearing">Zúčtování&#8230;</string>
-  <string name="c_feedback_title">Zpětná vazba</string>
   <string name="c_feedback_text">Už jste používali Kalkulátor++ dost dlouho \n
 a rádi by sme vědeli Vás názor na aplikaci.\n\n
 Prosím ohodnoďte Kalkulačku++ \nna<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 Google Play</a>,\n nechte komentář nebo \ndiskutujte o aplikaci \nna
 <a href="http://facebook.com/calculatorpp">Facebooku</a>
 	</string>
-  <string name="c_notespp_announce_text">Dobré zprávy - právě jsem vydal novou aplikaci pro Android zvanou 
-<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-		Když máte zájem o možnost snadného a rychlého způsobu zapisování zapisků prosím nasledujte <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">linku</a>a vyzkoušejte Notes++!
-	</string>
   <string name="c_angle_units_changed_to">Jednotky úhlu byli změněny na \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Číselný základ byl změněn na \'%s\'!</string>
   <string name="c_conversion_tool">Převod soustav</string>
@@ -177,18 +142,7 @@ Google Play</a>,\n nechte komentář nebo \ndiskutujte o aplikaci \nna
   <string name="other">Ostatní</string>
   <string name="derivatives">Derivace/Integrály</string>
   <string name="crashed">Kalkulačka&#8230;++ se zhroutila&#8230;</string>
-  <string name="crash_dialog_title">Zpráva o selhání Kalkulačky++</string>
-  <string name="crash_dialog_text">Bohužel Kalkulačka++ se zhroutila.\n\n
-Aby jsme mohli chybu napravit, potřebujeme detaily o pádu aplikace. Proto doporučujeme zaslat zprávu o pádu aplikace emailem (po stlačení tlačítka \'Ano\' uvidíte všechny údaje pro zaslání v novém okně).\n\n
-Chcete zaslat zprávu o pádu aplikace?
-	</string>
   <string name="prefs_graph_screen_title">Nastavení grafu</string>
-  <string name="prefs_graph_interpolate_function">Interpolovat graf funkce</string>
-  <string name="prefs_graph_interpolate_function_summary">Je-li zapnuta kubická interpolace, bude použita při vykreslování grafu funkce</string>
-  <string name="prefs_graph_real_color_title">Barva reálné části grafu funkce</string>
-  <string name="prefs_graph_real_color_summary">Nastaví barvu reálné části grafu funkce</string>
-  <string name="prefs_graph_imag_color_title">Barva imaginární části grafu funkce</string>
-  <string name="prefs_graph_imag_color_summary">Nastaví barvu imaginární části grafu funkce</string>
   <string name="p_white_line_color">Bílá</string>
   <string name="p_grey_line_color">Šedá</string>
   <string name="p_red_line_color">Červená</string>
@@ -208,17 +162,16 @@ Chcete zaslat zprávu o pádu aplikace?
   <string name="empty_function_error">Nelze vytvořit prázdnou funkci!</string>
   <string name="do_not_show_messages_in_session">Nezobrazovat tuto zprávu až do příštího spuštění</string>
   <string name="calculation_messages_dialog_title">Kalkulačka ++ varování</string>
-  <string name="arithmetic_error_while_plot">Při vykreslování došlo k aritmetické chybě: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Zobrazit zprávy o výpočtu v dialogovém okně</string>
   <string name="p_show_calculation_messages_dialog_summary">Pokud dojde k chybě při výpočtu a tato funkce je povolena, zobrazí se dialogové okno</string>
   <string name="fix">Opravit</string>
   <string name="p_preferred_numeral_base_title">Výchozí číselná soustava</string>
   <string name="p_preferred_numeral_base_summary">Definujte výchozí číselnou soustavu</string>
-  <string name="preferred_numeral_base_message">Výchozí číselná soustava \'%1$s\' se liší od aktuálního \'%2$s\'. Zapomněl jste vrátit změny?</string>
+  <string name="preferred_numeral_base_message">Výchozí číselná soustava \'%1$s\' se liší od aktuálního\"%2$s\". Zapomněl jste vrátit změny?</string>
   <string name="p_preferred_angle_units_title">Výchozí jednotka úhlu</string>
   <string name="p_preferred_angle_units_summary">Definuje výchozí jednotku úhlu</string>
-  <string name="preferred_angle_units_message">Výchozí úhel jednotky \'%1$s\' se liší od aktuální \'%2$s\'. Zapomněl jste vrátit zpět?</string>
+  <string name="preferred_angle_units_message">Výchozí úhel jednotky \'%1$s\' se liší od aktuální \'%2$s\". Zapomněl jste vrátit zpět?</string>
   <string name="close">Zavřít</string>
   <string name="c_app_widget_3x3_name">Kalkulačka ++ Widget (3 x 3)</string>
   <string name="c_app_widget_3x4_name">Kalkulačka ++ Widget (3 x 4)</string>
@@ -230,7 +183,6 @@ Chcete zaslat zprávu o pádu aplikace?
   <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_onscreen_remove_icon_message">Můžete odstranit druhou ikonu v seznamu aplikací ze seznamu aplikací nebo stisknutím tlačítka \"Další \"</string>
   <string name="cpp_this_change_may_require_reboot">Tato změna může vyžadovat restartování systému</string>
   <string name="cpp_plot_2d">2D graf</string>
   <string name="cpp_plot_3d">3D graf</string>
@@ -245,7 +197,7 @@ Chcete zaslat zprávu o pádu aplikace?
   <string name="cpp_dash_dotted_line_style">Čerchovaná (-.-.-)</string>
   <string name="cpp_plotter">Funkce vykreslování</string>
   <string name="cpp_plot_screenshot">Zachytit snímek obrazovky</string>
-  <string name="cpp_plot_screenshot_saved">Snímek obrazovky byl úspěšně uložen: %1$s!</string>
+  <string name="cpp_plot_screenshot_saved">Snímek obrazovky byl úspěšně uložen: %1$ s!</string>
   <string name="cpp_plot_unable_to_save_screenshot">Snímek obrazovky nelze uložit na SD kartu, protože není připojena. Prosím vložte SD kartu a opakujte akci!</string>
   <string name="cpp_plot_function_line_color_type">Typ barvy čáry</string>
   <string name="cpp_plot_function_line_color">Barva čáry</string>
@@ -272,8 +224,11 @@ Chcete zaslat zprávu o pádu aplikace?
   <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_purchase_thank_you_text">Děkujeme za vaší podporu!\n\n Může trvat několik minut, něž aplikace bude informována o zakoupení. Občas můžete stav o zakoupení sledovat na Vašem účtu\n
-Pokud se naskytnou problémy a nebo budete mít otázky, tak neváhejte a kontaktuje nás (contactsMain-&gt;Menu-&gt;About)</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>
+  <string name="cpp_new_in_version">Nové ve verzi %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Chcete vyzkoušet nové Material témata? Vyberte je ze seznamu:</string>
 </resources>
diff --git a/android-app/src/main/res/values-de/text_strings.xml b/android-app/src/main/res/values-de/text_strings.xml
index cd0bd8f6..ff6756d4 100644
--- a/android-app/src/main/res/values-de/text_strings.xml
+++ b/android-app/src/main/res/values-de/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (Fenstermodus)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Einstellungen</string>
-  <string name="c_syntax_error">Fehler</string>
   <string name="c_result_copied">Ergebnis wurde in die Zwischenablage kopiert!</string>
   <string name="c_settings">Einstellungen</string>
   <string name="c_help">Hilfe</string>
   <string name="c_vars_and_constants">Variablen und Konstanten</string>
-  <string name="c_prefs_main_category">Haupteinstellungen</string>
   <string name="c_prefs_calculations_category">Berechnungseinstellungen</string>
   <string name="c_prefs_appearance_category">Darstellungseinstellungen</string>
   <string name="c_prefs_other_category">Andere Einstellungen</string>
-  <string name="c_prefs_drag_button_category"> Schiebeknopf Einstellungen</string>
-  <string name="c_down">Nach unten</string>
-  <string name="c_up">Nach oben</string>
-  <string name="c_restart">Neustart</string>
   <string name="c_undo">Rückgängig</string>
   <string name="c_redo">wiederholen</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">einfügen</string>
   <string name="c_vars">Variablen</string>
   <string name="c_copy">Kopieren</string>
   <string name="c_plot">Graph zeichnen</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Maximale Rechenzeit</string>
   <string name="p_calc_max_calculation_time_summary">Wenn eine Berechnung die angegebene Zeit überschreitet, diese Berechnung mit einem Fehler stoppen.</string>
   <string name="c_exit">Schließen</string>
-  <string name="c_add">Hinzufügen</string>
   <string name="c_cancel">Abbrechen</string>
   <string name="c_save">Speichern</string>
   <string name="c_remove">Löschen</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Variablenname überschneidet sich mit Funktionsnamen!</string>
   <string name="c_var_already_exists">Variable mit gleichen Namen existiert bereits!</string>
   <string name="c_name_is_not_valid">Name der Konstante ist ungültig: Name muss mit einem Buchstaben beginnen und darf nur Buchstaben, Ziffern und Unterstriche enthalten.</string>
-  <string name="c_sys_var_cannot_be_changed">Systemvariable kann nicht geändert werden!</string>
   <string name="c_calc_editor_hint">Neue Rechnung hier eingeben</string>
-  <string name="c_press_to_copy">Drücken zum Kopieren</string>
-  <string name="c_continue">Weiter</string>
   <string name="c_history">Verlauf</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Verlauf ist leer!</string>
-  <string name="c_app_history">Verlauf</string>
   <string name="c_char_is_not_accepted">Zeichen \'%s\' kann in den Variablennamen nicht akzeptiert werden!</string>
   <string name="c_calc_angle_units">Aktuelle Winkeleinheit</string>
   <string name="p_deg">Grad</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Oktal</string>
   <string name="p_bin">Binär</string>
   <string name="c_calc_theme">Stil</string>
-  <string name="p_default_theme">Grau</string>
-  <string name="p_violet_theme">Violett</string>
-  <string name="p_light_blue_theme">Hellblau</string>
   <string name="p_metro_blue_theme">Metro Blau</string>
   <string name="p_metro_green_theme">Metro Grün</string>
   <string name="p_metro_purple_theme">Metro Lila</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Genauigkeit des Resultats (alle Berechnungen sind mit höchster Genauigkeit unabhängig von dieser Option)</string>
   <string name="c_calc_color_display_summary">Schaltet Farbe und Stil des Editors um</string>
   <string name="c_calc_theme_summary">Setzt den Stil für den Rechner</string>
-  <string name="c_clear_history">Verlauf löschen</string>
   <string name="c_toggle_datetime">Datum ein-/ausblenden</string>
-  <string name="c_simplify_instead_of_numeric">Folgende Konstanten sind nicht definiert: {0}!</string>
   <string name="p_grouping_separator_no">Kein 1000er-Trennzeichen</string>
   <string name="p_grouping_separator_apostrophe">Apostroph (\')</string>
   <string name="p_grouping_separator_space">Leerzeichen ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Multiplikationszeichen</string>
   <string name="c_calc_multiplication_sign_summary">Multiplikationszeichen setzen</string>
   <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_cellphone">Wissenschaftlich (Handy)</string>
   <string name="p_layout_calculator">Wissenschaftlich</string>
   <string name="p_layout_calculator_mobile">Wissenschaftlich (große Tasten)</string>
   <string name="p_layout_simple">Einfach</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Layout der Tasten setzen</string>
   <string name="c_calc_haptic_feedback_title">Haptische Rückmeldung</string>
   <string name="c_calc_haptic_feedback_summary">Vibration beim Tastendruck ein-/ausschalten</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Kurz</string>
   <string name="p_calc_haptic_feedback_strength_middle">Mittel</string>
   <string name="p_calc_haptic_feedback_strength_long">Lang</string>
-  <string name="p_calc_haptic_feedback_duration_title">Dauer der haptischen Rückmeldung</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Dauer der Vibration bei Tastendruck</string>
   <string name="empty_var_error">Erstellung einer leeren Konstante nicht möglich!</string>
   <string name="not_valid_result">Aktuelles Ergebnis ist ungültig!</string>
   <string name="c_plot_graph">Graph</string>
   <string name="c_min_x_value">Von</string>
   <string name="c_max_x_value">Bis</string>
-  <string name="c_swipe_distance">Wischdistanz für Schaltflächen</string>
-  <string name="c_swipe_distance_summary">Setzt die Wischdistanz für Schaltflächen mit zusätzlichen Wischaktionen</string>
-  <string name="c_comment">Kommentar</string>
-  <string name="c_history_item_saved">Gespeichert</string>
-  <string name="c_history_item_not_saved">Nicht gespeichert</string>
   <string name="c_expression_copied">Ausdruck in die Zwischenablage kopiert!</string>
-  <string name="c_history_item_status">Status:</string>
-  <string name="c_history_item_comment">Kommentar:</string>
   <string name="c_use">Verwendung</string>
   <string name="c_use_short">Verwendung</string>
   <string name="c_copy_expression">Ausdruck kopieren</string>
   <string name="c_copy_result">Ergebnis kopieren</string>
   <string name="c_history_expression">Wert</string>
-  <string name="c_history_item_already_saved">Gespeichert (siehe Tab \"Gespeicherter Verlauf\")</string>
   <string name="c_history_comment">Bemerkung</string>
   <string name="c_save_history">Verlauf speichern</string>
   <string name="c_edit_history">Verlauf ändern</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Beschreibung kopieren</string>
   <string name="c_copy_value">Wert kopieren</string>
   <string name="c_first_start_text">Vielen Dank, dass sie Calculator++ benutzen! \n\nCalculator++ ist ein mächtiges Tool für viele Berechnungen.</string>
-  <string name="c_first_start_text_title">Willkommen</string>
   <string name="c_calc_show_release_notes_title">Releasebemerkungen zeigen</string>
   <string name="c_calc_show_release_notes_summary">Definiert, ob ein Popup-Fenster mit den Versionshinweisen nach einer Programmaktualisierung angezeigt werden soll.</string>
   <string name="c_calc_use_back_button_as_prev_summary">Definiert das Verhalten des Zurückknopfs</string>
@@ -153,14 +125,9 @@ der mit Ihrem Google Konto verknüpft ist, und Sie müssen ein Internetanschluss
   <string name="c_calc_ad_free_title">Unterstützen Sie das Projekt</string>
   <string name="c_calc_ad_free_summary">Und die Werbung entfernen</string>
   <string name="c_calc_already_purchased">Werbefreie Version bereits gekauft!</string>
-  <string name="c_calc_purchasing">Kaufvorgang...</string>
-  <string name="c_calc_clearing">Löschvorgang...</string>
-  <string name="c_feedback_title">Feedback</string>
   <string name="c_feedback_text">Sie benutzen Calculator++ schon einige Zeit\nund Ihre Meinung über die Anwendung ist uns wichtig.\n\nBitte bewerten Sie Calculator++\n auf<a href="https://market.android.com/details?id=org.solovyev.android.calculator"> 
 Google Play</a>,\nschreiben Sie einen Kommentar oder\ndiskutieren Sie die Anwendung auf\n
 <a href="http://facebook.com/calculatorpp"> Facebook</a>.</string>
-  <string name="c_notespp_announce_text">Gute Nachrichten - Ich habe gerade eine neue App für Android veröffentlicht. Sie heißt <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-Wenn Sie sich für einen schnellen und einfachen Weg zur Erstellung von Notizen interessieren, folgen Sie dem <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Link</a> und probieren Sie Notes++!</string>
   <string name="c_angle_units_changed_to">Winkeleinheiten zu \'%s\' geändert!</string>
   <string name="c_numeral_base_changed_to">Numerische Basis zu \'%s\' geändert!</string>
   <string name="c_conversion_tool">Umrechnungstool</string>
@@ -173,17 +140,7 @@ Wenn Sie sich für einen schnellen und einfachen Weg zur Erstellung von Notizen
   <string name="other">Andere</string>
   <string name="derivatives">Ableitungen/Integrale</string>
   <string name="crashed">Calculator++ ist abgestürzt...</string>
-  <string name="crash_dialog_title">Calculator++ Absturzbericht</string>
-  <string name="crash_dialog_text">Leider ist Calculator++ abgestürzt.\n\n
-Um das Problem beheben zu können, benötigen wir einige Informationen. Wenn Sie mir dabei helfen wollen, senden sie mir den Absturzbericht per Email zu. Nach dem drücken der Ok-Taste werden sie alle gesendeten Daten in einem neuen Fenster angezeigt.\n\n
-Möchten Sie den Absturzbericht senden?</string>
   <string name="prefs_graph_screen_title">Grapheinstellungen</string>
-  <string name="prefs_graph_interpolate_function">Graph interpolieren</string>
-  <string name="prefs_graph_interpolate_function_summary">Falls aktiviert wird kubische Interpolation beim Graphzeichnen angewendet</string>
-  <string name="prefs_graph_real_color_title">Farbe des Realteils des Graphen</string>
-  <string name="prefs_graph_real_color_summary">Setze die Farbe des Realteils des Funktionsgraphen</string>
-  <string name="prefs_graph_imag_color_title">Farbe des Imaginärteil des Graphen</string>
-  <string name="prefs_graph_imag_color_summary">Setzt die Farbe des Imaginärteils des Funktionsgraphen</string>
   <string name="p_white_line_color">Weiß</string>
   <string name="p_grey_line_color">Grau</string>
   <string name="p_red_line_color">Rot</string>
@@ -203,7 +160,6 @@ Möchten Sie den Absturzbericht senden?</string>
   <string name="empty_function_error">Eine leere Funktion kann nicht erstellt werden!</string>
   <string name="do_not_show_messages_in_session">Diese Nachricht bis zum nächsten Mal verbergen</string>
   <string name="calculation_messages_dialog_title">Calculator++ Warnung</string>
-  <string name="arithmetic_error_while_plot">Arithmetischer Fehler ist beim Darstellen aufgetreten: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Berechnungsnachrichten im Dialog anzeigen</string>
   <string name="p_show_calculation_messages_dialog_summary">Wenn aktiviert, werden Nachrichten, die während der Berechnung auftauchen in einem gesondertem Dialog gezeigt.</string>
@@ -225,8 +181,6 @@ Möchten Sie den Absturzbericht senden?</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_onscreen_remove_icon_message">Sie können das zweite Symbol in der Anwendungsliste mit Hilfe 
-der Anwendungseinstellungen oder mit drücken der Weiter-Schaltfläche entfernen</string>
   <string name="cpp_this_change_may_require_reboot">Diese Änderung kann einen Neustart erfordern</string>
   <string name="cpp_plot_2d">2D Graph</string>
   <string name="cpp_plot_3d">3D Graph</string>
@@ -269,8 +223,11 @@ der Anwendungseinstellungen oder mit drücken der Weiter-Schaltfläche entfernen
 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_purchase_thank_you_text">Vielen Dank für die Unterstützung der Anwendung!\n\n Es kann einige Minuten dauern, bis die Anwendung über einen Kauf informiert wird. Sie können die Kaufinformationen immer in Ihrem Google-Konto überprüfen.\n
-Wenn Sie irgendwelche Probleme oder Fragen haben, kontaktieren Sie mich direkt (Kontaktdaten sind im Hauptbildschirm-&gt;Menü-&gt;Über)</string>
   <string name="cpp_var_show_greek_keyboard">Zeige griechische Buchstaben</string>
   <string name="cpp_var_hide_greek_keyboard">Verstecke griechische Buchstaben</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-es/text_strings.xml b/android-app/src/main/res/values-es/text_strings.xml
index 5dd3048c..104c801b 100644
--- a/android-app/src/main/res/values-es/text_strings.xml
+++ b/android-app/src/main/res/values-es/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculadora++</string>
   <string name="c_app_name_on_screen">Calculadora++ (Modo ventana)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Ajustes</string>
-  <string name="c_syntax_error">Error</string>
   <string name="c_result_copied">¡El resultado se ha copiado en el portapapeles!</string>
   <string name="c_settings">Configuración</string>
   <string name="c_help">Ayuda</string>
   <string name="c_vars_and_constants">Variables y Constantes</string>
-  <string name="c_prefs_main_category">Ajustes principales</string>
   <string name="c_prefs_calculations_category">Ajustes de Cálculo</string>
   <string name="c_prefs_appearance_category">Ajustes de apariencia</string>
   <string name="c_prefs_other_category">Otros ajustes</string>
-  <string name="c_prefs_drag_button_category">Configuración del deslizamiento de los botones</string>
-  <string name="c_down">Abajo</string>
-  <string name="c_up">Arriba</string>
-  <string name="c_restart">Reiniciar</string>
   <string name="c_undo">deshacer</string>
   <string name="c_redo">rehacer</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">pegar</string>
   <string name="c_vars">variables</string>
   <string name="c_copy">Copiar</string>
   <string name="c_plot">Trazar gráfico</string>
@@ -37,7 +29,6 @@
   <string name="p_calc_max_calculation_time_title">Tiempo máximo de cálculo</string>
   <string name="p_calc_max_calculation_time_summary">Si los cálculos superan el límite establecido - la calculadora muestra un error y se detiene</string>
   <string name="c_exit">Salir</string>
-  <string name="c_add">Añadir</string>
   <string name="c_cancel">Cancelar</string>
   <string name="c_save">Grabar</string>
   <string name="c_remove">Borrar</string>
@@ -55,14 +46,9 @@
   <string name="c_var_already_exists">¡Ya existe una variable con el mismo nombre!</string>
   <string name="c_name_is_not_valid">El nombre de la constante no es válido: el nombre debe comenzar con una letra, y puede contener letras, dígitos y líneas.
 	</string>
-  <string name="c_sys_var_cannot_be_changed">¡Una Variable de Sistema no puede ser cambiada!</string>
   <string name="c_calc_editor_hint">Introducir nuevo cálculo</string>
-  <string name="c_press_to_copy">Pulsar para copiar</string>
-  <string name="c_continue">Continuar</string>
   <string name="c_history">Historial</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">¡El Historial está vacío!</string>
-  <string name="c_app_history">Historial</string>
   <string name="c_char_is_not_accepted">El caracter \'%s\' no es aceptado como variable!</string>
   <string name="c_calc_angle_units">Unidades de Ángulos</string>
   <string name="p_deg">Grados</string>
@@ -78,18 +64,15 @@
   <string name="p_oct">Octal</string>
   <string name="p_bin">Binario</string>
   <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Gris</string>
-  <string name="p_violet_theme">Violeta</string>
-  <string name="p_light_blue_theme">Azul claro</string>
   <string name="p_metro_blue_theme">Metro Azul</string>
   <string name="p_metro_green_theme">Metro Verde</string>
   <string name="p_metro_purple_theme">Metro Morado</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material ligero</string>
   <string name="c_calc_result_precision_summary">Precisión en el valor del resultado (todos los cálculos se realizan con la máxima precisión, independientemente del valor de esta opción)</string>
   <string name="c_calc_color_display_summary">Activa o desactiva los colores y estilos en el editor de la calculadora</string>
   <string name="c_calc_theme_summary">Establecer el tema para la Calculadora</string>
-  <string name="c_clear_history">Limpiar historial</string>
   <string name="c_toggle_datetime">Mostrar/Ocultar fecha</string>
-  <string name="c_simplify_instead_of_numeric">Las constantes siguientes no están definidas: {0}!</string>
   <string name="p_grouping_separator_no">No usar separador de Grupos</string>
   <string name="p_grouping_separator_apostrophe">Apóstrofe (\')</string>
   <string name="p_grouping_separator_space">Espacio ( )</string>
@@ -98,7 +81,6 @@
   <string name="c_calc_multiplication_sign">Signo de multiplicación</string>
   <string name="c_calc_multiplication_sign_summary">Establece signo de multiplicación</string>
   <string name="c_calc_layout">Plantilla</string>
-  <string name="p_layout_cellphone">Teléfono</string>
   <string name="p_layout_calculator">Calculadora</string>
   <string name="p_layout_calculator_mobile">Científica (Botones grandes)</string>
   <string name="p_layout_simple">Sencilla</string>
@@ -106,30 +88,21 @@
   <string name="c_calc_layout_summary">Establecer la plantilla de los botones</string>
   <string name="c_calc_haptic_feedback_title">Configurar vibración</string>
   <string name="c_calc_haptic_feedback_summary">Vibrar al pulsar un botón</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Desactivado</string>
   <string name="p_calc_haptic_feedback_strength_short">Corto</string>
   <string name="p_calc_haptic_feedback_strength_middle">Medio</string>
   <string name="p_calc_haptic_feedback_strength_long">Largo</string>
-  <string name="p_calc_haptic_feedback_duration_title">Duración de la vibración</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Duración de la vibración al pulsar un butón</string>
   <string name="empty_var_error">No se puede crear una constante vacía!</string>
   <string name="not_valid_result">El resultado actual no es válido!</string>
   <string name="c_plot_graph">Gráfico</string>
   <string name="c_min_x_value">Desde</string>
   <string name="c_max_x_value">Hasta</string>
-  <string name="c_swipe_distance">Distancia de deslizado para los botones</string>
-  <string name="c_swipe_distance_summary">Establece la distancia de deslizado para los botones que admiten acciones adicionales de deslizado</string>
-  <string name="c_comment">Comentario</string>
-  <string name="c_history_item_saved">Guardado</string>
-  <string name="c_history_item_not_saved">No se guarda</string>
   <string name="c_expression_copied">Expresión copiada en el portapapeles!</string>
-  <string name="c_history_item_status">Estado:</string>
-  <string name="c_history_item_comment">Comentario:</string>
   <string name="c_use">Utilizar</string>
   <string name="c_use_short">Uso</string>
   <string name="c_copy_expression">Copia de la expresión</string>
   <string name="c_copy_result">Copia resultado</string>
   <string name="c_history_expression">Valor</string>
-  <string name="c_history_item_already_saved">Salvo (ver \'La historia guardada\' ficha)</string>
   <string name="c_history_comment">Comentario</string>
   <string name="c_save_history">Guardar el historial de</string>
   <string name="c_edit_history">Modificar la historia</string>
@@ -142,7 +115,6 @@
   <string name="c_copy_description">Сopia de la descripción</string>
   <string name="c_copy_value">Сopia el valor</string>
   <string name="c_first_start_text">¡Gracias por elegir Calculadora++!\n\nCalculadora++ es una potente herramienta para realizar sus cálculos cotidianos.</string>
-  <string name="c_first_start_text_title">Bienvenido</string>
   <string name="c_calc_show_release_notes_title">Mostrar notas de la versión</string>
   <string name="c_calc_show_release_notes_summary">Establece si la ventana emergente de las notas de versión debe aparecer tras actualizar a una nueva versión</string>
   <string name="c_calc_use_back_button_as_prev_summary">Establece el comportamiento del botón \"Atrás\"</string>
@@ -155,11 +127,7 @@
   <string name="c_calc_ad_free_title">Apoyar el proyecto</string>
   <string name="c_calc_ad_free_summary">Y eliminar los anuncios</string>
   <string name="c_calc_already_purchased">¡La opción sin publicidad ya ha sido comprada previamente!</string>
-  <string name="c_calc_purchasing">Realizando compra...</string>
-  <string name="c_calc_clearing">Realizando limpieza...</string>
-  <string name="c_feedback_title">Críticas y comentarios</string>
   <string name="c_feedback_text">Has usado calculadora ++ y es importante para nosotros saber tu opinión sobre application.\n\n por favor vota calculadora ++ en: \non <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a>, \n deja un comentario o \ndiscuss la \non aplicación <a href="\nhttp://facebook.com/calculatorpp"> Facebook</a>  </string>
-  <string name="c_notespp_announce_text">Buenas noticias - acabo de lanzar una nueva aplicación para Android llamada <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> notas ++</a>. \n si usted está interesado en una manera rápida y fácil de hacer notas por favor siga el <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> enlace</a> y pruebe de notas ++!  </string>
   <string name="c_angle_units_changed_to">Las unidades de los ángulos han sido cambiados a \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Se ha cambiado la base del numeral a \'%s\'!</string>
   <string name="c_conversion_tool">Herramienta de conversión</string>
@@ -172,17 +140,7 @@
   <string name="other">Otro</string>
   <string name="derivatives">Derivadas/Integrales</string>
   <string name="crashed">Calculator++ se ha detenido&#8230;</string>
-  <string name="crash_dialog_title">Calculator++ reporte de error</string>
-  <string name="crash_dialog_text">  Desafortunadamanete, Calculator++ se ha parado.\n\n
-Para poder arreglar el problema necesitamos información acerca de el error. Es muy recomendable mandar un informe de error, vía email (después de presionar el botón de \'Ok\' verá toda la información que se enviará en una nueva ventana),\n\n
-¿Quiere mandara un reporte de error?</string>
   <string name="prefs_graph_screen_title">Ajustes de gráfica</string>
-  <string name="prefs_graph_interpolate_function">Gráfico de la función de interpolación</string>
-  <string name="prefs_graph_interpolate_function_summary">Si está marcado, se empleará la interpolación cúbica para dibujar la gráfica de función</string>
-  <string name="prefs_graph_real_color_title">Color de la parte real del gráfico de funciones</string>
-  <string name="prefs_graph_real_color_summary">Establece el color del gráfico de funciones de parte real</string>
-  <string name="prefs_graph_imag_color_title">Color de la parte imaginaria del gráfico de funciones</string>
-  <string name="prefs_graph_imag_color_summary">Establece el color del gráfico de funciones de parte imaginaria</string>
   <string name="p_white_line_color">Blanco</string>
   <string name="p_grey_line_color">Gris</string>
   <string name="p_red_line_color">Rojo</string>
@@ -202,7 +160,6 @@ Para poder arreglar el problema necesitamos información acerca de el error. Es
   <string name="empty_function_error">¡No se puede crear una función vacía!</string>
   <string name="do_not_show_messages_in_session">No mostrar este mensaje hasta la próxima sesión</string>
   <string name="calculation_messages_dialog_title">Advertencia de Calculadora++</string>
-  <string name="arithmetic_error_while_plot">Se ha producido un error aritmético al trazar: %s</string>
   <string name="ok">De acuerdo</string>
   <string name="p_show_calculation_messages_dialog_title">Mostrar mensajes de cálculo en el cuadro de diálogo</string>
   <string name="p_show_calculation_messages_dialog_summary">Si está activado, se mostrará un cuadro de diálogo especial si se produjera algún mensaje durante los cálculos</string>
@@ -225,7 +182,6 @@ Para poder arreglar el problema necesitamos información acerca de el error. Es
   <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_onscreen_remove_icon_message">Puedes quitar el segundo icono de la lista de aplicaciones desde los ajustes de la aplicación, o pulsando el botón siguiente</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_plot_2d">Trazado 2D</string>
   <string name="cpp_plot_3d">Trazado 3D</string>
@@ -266,7 +222,11 @@ Para poder arreglar el problema necesitamos información acerca de el error. Es
   <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_purchase_thank_you_text">¡Gracias por apoyar esta aplicación! \n\n Pueden pasar varios minutos hasta que la aplicación actualice la información de compra. Puedes revisar la información de compra en tu cuenta de Google siempre que lo desees. \n Ante cualquier problema o pregunta sobre la aplicación, no dudes en contactarme directamente (los datos de contacto están disponibles en Principal-&gt;Menú-&gt;Acerca de)</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>
+  <string name="cpp_new_in_version">Nuevo en versión %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-fi/text_strings.xml b/android-app/src/main/res/values-fi/text_strings.xml
index 91b1ffe1..24e9100a 100644
--- a/android-app/src/main/res/values-fi/text_strings.xml
+++ b/android-app/src/main/res/values-fi/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Laskin++</string>
   <string name="c_app_name_on_screen">Laskin++ (ikkuna-tilassa)</string>
-  <string name="c_app_icon_name">Laskin++</string>
   <string name="c_app_settings">Asetukset</string>
-  <string name="c_syntax_error">Error</string>
   <string name="c_result_copied">Tulos on kopioitu Leikepöydälle!</string>
   <string name="c_settings">Asetukset</string>
   <string name="c_help">Apua</string>
   <string name="c_vars_and_constants">Muuttujien ja vakioiden</string>
-  <string name="c_prefs_main_category">Tärkeimmät asetukset</string>
   <string name="c_prefs_calculations_category">Laskenta-asetukset</string>
   <string name="c_prefs_appearance_category">Ulkoasuasetukset</string>
   <string name="c_prefs_other_category">Muut asetukset</string>
-  <string name="c_prefs_drag_button_category">painikkeiden vetämis asetukset</string>
-  <string name="c_down">Alas</string>
-  <string name="c_up">Ylös</string>
-  <string name="c_restart">Käynnistä uudelleen</string>
   <string name="c_undo">Kumoa</string>
   <string name="c_redo">Tee uudelleen</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">Liitä</string>
   <string name="c_vars">Vars</string>
   <string name="c_copy">Kopioi</string>
   <string name="c_plot">Kaavion tulostamisessa</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Suurin laskenta-aika</string>
   <string name="p_calc_max_calculation_time_summary">Jos laskelmat ylittää määritetyn rajan - Laskin pysäyttää virhe</string>
   <string name="c_exit">Poistu</string>
-  <string name="c_add">Lisää</string>
   <string name="c_cancel">Peruuta</string>
   <string name="c_save">Tallenna</string>
   <string name="c_remove">Poista</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Muuttujan nimi törmää funktionimi!</string>
   <string name="c_var_already_exists">Muuttuja, jolla on sama nimi on jo olemassa!</string>
   <string name="c_name_is_not_valid">Vakion nimi ei kelpaa: nimen on alettava kirjaimella, voi sisältää kirjaimia, numeroita ja alaviivoja.  </string>
-  <string name="c_sys_var_cannot_be_changed">Järjestelmämuuttuja ei voi muuttaa.</string>
   <string name="c_calc_editor_hint">Kirjoita uusi lauseke</string>
-  <string name="c_press_to_copy">Paina Kopioi</string>
-  <string name="c_continue">Jatka</string>
   <string name="c_history">Historia</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Historia on tyhjä!</string>
-  <string name="c_app_history">Historia</string>
   <string name="c_char_is_not_accepted">Merkki \'%s\' ei ole hyväksytty muuttujan nimi!</string>
   <string name="c_calc_angle_units">Kulman yksiköt</string>
   <string name="p_deg">Astetta</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Oktaaliluvun muuntaminen</string>
   <string name="p_bin">Binary</string>
   <string name="c_calc_theme">Teema</string>
-  <string name="p_default_theme">Harmaa</string>
-  <string name="p_violet_theme">Violetti</string>
-  <string name="p_light_blue_theme">Vaaleansininen</string>
   <string name="p_metro_blue_theme">Metron Sininen</string>
   <string name="p_metro_green_theme">Metron vihreä</string>
   <string name="p_metro_purple_theme">Metro violetti</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Tarkkuus tuloksen arvoa (kaikki laskelmat ovat tehneet tarkkuudella riippumatta tämän asetuksen arvosta)  </string>
   <string name="c_calc_color_display_summary">Vaihtaa värin ja styling Laskin-editorissa</string>
   <string name="c_calc_theme_summary">Asettaa Teemaa  Laskimeen</string>
-  <string name="c_clear_history">Tyhjennä historiatiedot</string>
   <string name="c_toggle_datetime">Näytä tai Piilota päivämäärä</string>
-  <string name="c_simplify_instead_of_numeric">Seuraava vakioita ei ole määritetty: {0}!</string>
   <string name="p_grouping_separator_no">Ilman ryhmittelyä erotinta</string>
   <string name="p_grouping_separator_apostrophe">Heittomerkki (\')</string>
   <string name="p_grouping_separator_space">Väli ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Kertolasku</string>
   <string name="c_calc_multiplication_sign_summary">Määrittää kertolasku</string>
   <string name="c_calc_layout">Asettelu</string>
-  <string name="p_layout_cellphone">Tieteellinen (matkapuhelin)</string>
   <string name="p_layout_calculator">Tieteellinen</string>
   <string name="p_layout_calculator_mobile">Tieteellinen (isot näppäimet)</string>
   <string name="p_layout_simple">Yksinkertainen</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Asetetaan ulkoasua painikkeet</string>
   <string name="c_calc_haptic_feedback_title">Haptic palaute</string>
   <string name="c_calc_haptic_feedback_summary">Vaihtaa tärinä-painiketta napsauttamalla</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Lyhyt</string>
   <string name="p_calc_haptic_feedback_strength_middle">Keskellä</string>
   <string name="p_calc_haptic_feedback_strength_long">Pitkä</string>
-  <string name="p_calc_haptic_feedback_duration_title">Haptic palaute kesto</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Kesto tärinä painike</string>
   <string name="empty_var_error">Ei voi luoda tyhjä vakio!</string>
   <string name="not_valid_result">Nykyinen tulos ei kelpaa!</string>
   <string name="c_plot_graph">Kaavio</string>
   <string name="c_min_x_value">Alkaen</string>
   <string name="c_max_x_value">Jotta</string>
-  <string name="c_swipe_distance">Pyyhkäise etäisyys painikkeet</string>
-  <string name="c_swipe_distance_summary">Asetetaan pyyhkäisemällä etäisyys painikkeiden, joka tukee muita pyyhkäisemällä</string>
-  <string name="c_comment">Kommentti</string>
-  <string name="c_history_item_saved">Tallennettu</string>
-  <string name="c_history_item_not_saved">Ei tallennettu</string>
   <string name="c_expression_copied">Ilmaisu Leikepöydälle!</string>
-  <string name="c_history_item_status">Tila:</string>
-  <string name="c_history_item_comment">Kommentti:</string>
   <string name="c_use">Käyttö</string>
   <string name="c_use_short">Käyttää</string>
   <string name="c_copy_expression">Kopioi lauseke</string>
   <string name="c_copy_result">Kopio tulos</string>
   <string name="c_history_expression">Arvo</string>
-  <string name="c_history_item_already_saved">Tallennettu (Katso tallennettu historia välilehti)</string>
   <string name="c_history_comment">Kommentti</string>
   <string name="c_save_history">Tallenna historia</string>
   <string name="c_edit_history">Muokkaa historia</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Kopioi kuvauksen</string>
   <string name="c_copy_value">Kopioi arvo</string>
   <string name="c_first_start_text">Kiitos Laskin ++! \n\nCalculator++ on tehokas työkalu tehdä tavallisiin laskutoimituksiin.</string>
-  <string name="c_first_start_text_title">Tervetuloa</string>
   <string name="c_calc_show_release_notes_title">Näytä julkaisutiedot</string>
   <string name="c_calc_show_release_notes_summary">Määrittää, onko release notes popup ikkuna tulee näkyviin kun päivitys uuteen versioon</string>
   <string name="c_calc_use_back_button_as_prev_summary">Määrittelee niiden takaisin-painiketta</string>
@@ -152,11 +124,7 @@
   <string name="c_calc_ad_free_title">Auta Projektia</string>
   <string name="c_calc_ad_free_summary">Ja poista mainokset</string>
   <string name="c_calc_already_purchased">Ilman mainoksia vaihtoehto on jo ostettu!</string>
-  <string name="c_calc_purchasing">Ostetaan&#8230;</string>
-  <string name="c_calc_clearing">Tyhjennetään&#8230;</string>
-  <string name="c_feedback_title">Palaute</string>
   <string name="c_feedback_text">Olet käyttänyt Laskin ++ aika \n ja se on tärkeää tietää teidän mielipiteenne application.\n\n Please korko Laskin ++ \non <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a>, \n jättää kommentin tai \ndiscuss hakemus \non <a href="http://facebook.com/calculatorpp"> Facebook</a>  </string>
-  <string name="c_notespp_announce_text">Hyviä uutisia - olen juuri julkaissut uuden sovelluksen Android nimeltään <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> muistiot++</a>. \n Jos haluat nopea ja helppo tapa tehdä muistiinpanoja seuraa <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> linkki</a> ja yritä notes ++!  </string>
   <string name="c_angle_units_changed_to">Kulman yksiköt ovat muuttuneet %s!</string>
   <string name="c_numeral_base_changed_to">Pohja numero on muuttunut %s!</string>
   <string name="c_conversion_tool">Muuntaminen työkalu</string>
@@ -169,15 +137,7 @@
   <string name="other">Muut</string>
   <string name="derivatives">Johdannaisten ja integraalit</string>
   <string name="crashed">Laskin ++ on kaatunut&#8230;</string>
-  <string name="crash_dialog_title">Laskin ++ kaatumisen ilmoitus</string>
-  <string name="crash_dialog_text">  Valitettavasti Laskin ++ on crashed.\n\n jotta fiksoida arvoitus tarvitsemme joitakin tietoja. On suositeltavaa, jotta lennättää rysähtäen erotodistus sähköpostitse (jälkeen painamalla \"Ok\" painiketta näet kaikki lähetetyt tiedot uusi window).\n\n ajaa te haluta jotta lennättää rysähtäen erotodistus?  </string>
   <string name="prefs_graph_screen_title">Grafiikka-asetukset</string>
-  <string name="prefs_graph_interpolate_function">Interpoloidaan funktion kuvaaja</string>
-  <string name="prefs_graph_interpolate_function_summary">Jos valittu cubic interpolointi käytetään funktion kuvaajan piirtäminen  </string>
-  <string name="prefs_graph_real_color_title">Väri todellinen osa toimintoja kaavio</string>
-  <string name="prefs_graph_real_color_summary">Määrittää värin reaaliosa toimintoja kaavio</string>
-  <string name="prefs_graph_imag_color_title">Väri kuvitteellinen osa toimintoja kaavio</string>
-  <string name="prefs_graph_imag_color_summary">Määrittää värin imaginaarinen osa toimintoja kaavio</string>
   <string name="p_white_line_color">Valkoinen</string>
   <string name="p_grey_line_color">Harmaa</string>
   <string name="p_red_line_color">Punainen</string>
@@ -197,7 +157,6 @@
   <string name="empty_function_error">Tyhjä funktion luominen ei onnistunut.</string>
   <string name="do_not_show_messages_in_session">Älä näytä tätä viestiä kunnes seuraavan istunnon</string>
   <string name="calculation_messages_dialog_title">Laskin ++ varoitus</string>
-  <string name="arithmetic_error_while_plot">Aritmeettinen virhe kuvaaja: %s</string>
   <string name="ok">Okei</string>
   <string name="p_show_calculation_messages_dialog_title">Näytä laskennan viestit dialogi</string>
   <string name="p_show_calculation_messages_dialog_summary">Jos käytössä, jos jokin asia tapahtui laskelmat erityistä valintaikkuna näytetään  </string>
@@ -219,7 +178,6 @@
   <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_onscreen_remove_icon_message">Voit poistaa toinen kuvake sovellusten luettelo sovelluksen asetukset tai painamalla Seuraava-painiketta  </string>
   <string name="cpp_this_change_may_require_reboot">Tämä muutos saattaa edellyttää uudelleenkäynnistyksen</string>
   <string name="cpp_plot_2d">2D tontti</string>
   <string name="cpp_plot_3d">3D tontti</string>
@@ -230,7 +188,7 @@
   <string name="cpp_color_map_line_color_type">Värikartta (ainoa 3D)</string>
   <string name="cpp_solid_line_style">Kiinteä (-)</string>
   <string name="cpp_dashed_line_style">Katkoviiva (- - -)</string>
-  <string name="cpp_dotted_line_style">Pisteviiva (...)</string>
+  <string name="cpp_dotted_line_style">Pisteviiva (. . .)</string>
   <string name="cpp_dash_dotted_line_style">Dot katkoviiva (-.-.-)</string>
   <string name="cpp_plotter">Tehtävä piirturit</string>
   <string name="cpp_plot_screenshot">Kaapata varjostin</string>
@@ -260,7 +218,11 @@
   <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_purchase_thank_you_text">Kiitos tukea tämän sovelluksen! \n\n saattaa kestää useita minuuttia kunnes app tiedotetaan osto. Voit aina tarkistaa osto tietoja Google tili. \n Jos sinulla on ongelmia tai kysymyksiä voit ottaa minuun yhteyttä suoraan (yhteydet ovat käytettävissä Main -&gt; Valikko -&gt; tietoja)  </string>
   <string name="cpp_var_show_greek_keyboard">Näytä kreikkalaiset kirjaimet</string>
   <string name="cpp_var_hide_greek_keyboard">Piilota kreikkalaiset kirjaimet</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-fr/text_strings.xml b/android-app/src/main/res/values-fr/text_strings.xml
index 0b3c844f..c977ab66 100644
--- a/android-app/src/main/res/values-fr/text_strings.xml
+++ b/android-app/src/main/res/values-fr/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (mode fenêtre)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Paramètres</string>
-  <string name="c_syntax_error">Erreur</string>
   <string name="c_result_copied">Le résultat a été copié dans le presse-papiers !</string>
   <string name="c_settings">Paramètres</string>
   <string name="c_help">Aide</string>
   <string name="c_vars_and_constants">Variables et constantes</string>
-  <string name="c_prefs_main_category">Paramètres principaux</string>
   <string name="c_prefs_calculations_category">Paramètres de calcul</string>
   <string name="c_prefs_appearance_category">Apparence</string>
   <string name="c_prefs_other_category">Autres paramètres</string>
-  <string name="c_prefs_drag_button_category">Paramètre des boutons à glisser</string>
-  <string name="c_down">Bas</string>
-  <string name="c_up">Haut</string>
-  <string name="c_restart">Redémarrer</string>
   <string name="c_undo">Annuler</string>
   <string name="c_redo">Refaire</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">Coller</string>
   <string name="c_vars">Variables</string>
   <string name="c_copy">Copier</string>
   <string name="c_plot">Tracer le graphe</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Durée maximale de calcul</string>
   <string name="p_calc_max_calculation_time_summary">Si les calculs dépassent la limite spécifiée - la calculatrice s\'arrête avec une erreur</string>
   <string name="c_exit">Quitter</string>
-  <string name="c_add">Ajouter</string>
   <string name="c_cancel">Annuler</string>
   <string name="c_save">Enregistrer</string>
   <string name="c_remove">Supprimer</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Nom de variable en conflit avec le nom d\'une fonction !</string>
   <string name="c_var_already_exists">Une variable portant le même nom existe déjà !</string>
   <string name="c_name_is_not_valid">Le nom de la constante n\'est pas valide : le nom doit commencer par une lettre, peut contenir des lettres, chiffres et trait de soulignement.  </string>
-  <string name="c_sys_var_cannot_be_changed">Impossible de modifier la variable système !</string>
   <string name="c_calc_editor_hint">Entrer une nouvelle expression</string>
-  <string name="c_press_to_copy">Appuyer pour copier</string>
-  <string name="c_continue">Continuer</string>
   <string name="c_history">Historique</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">L\'historique est vide !</string>
-  <string name="c_app_history">Historique</string>
   <string name="c_char_is_not_accepted">Le caractère \'%s\' n\'est pas accepté dans le nom de la variable !</string>
   <string name="c_calc_angle_units">Unités d\'angle actuelle</string>
   <string name="p_deg">Degrés</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Octal</string>
   <string name="p_bin">Binaire</string>
   <string name="c_calc_theme">Thème</string>
-  <string name="p_default_theme">Gris</string>
-  <string name="p_violet_theme">Violet</string>
-  <string name="p_light_blue_theme">Bleu clair</string>
   <string name="p_metro_blue_theme">Métro bleu</string>
   <string name="p_metro_green_theme">Métro vert</string>
   <string name="p_metro_purple_theme">Métro violet</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material léger</string>
   <string name="c_calc_result_precision_summary">Précision de la valeur du résultat (tous les calculs sont faits avec la précision maximale quelle que soit la valeur de cette option)</string>
   <string name="c_calc_color_display_summary">Choisir les couleurs et le style dans l\'éditeur de la calculatrice</string>
   <string name="c_calc_theme_summary">Définir le thème pour la calculatrice</string>
-  <string name="c_clear_history">Effacer l\'historique</string>
   <string name="c_toggle_datetime">Afficher/masquer la date</string>
-  <string name="c_simplify_instead_of_numeric">Les constantes suivantes ne sont pas définies : {0} !</string>
   <string name="p_grouping_separator_no">Pas de séparateur de classe</string>
   <string name="p_grouping_separator_apostrophe">Apostrophe (\')</string>
   <string name="p_grouping_separator_space">Espace ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Signe de multiplication</string>
   <string name="c_calc_multiplication_sign_summary">Choisir le signe de multiplication</string>
   <string name="c_calc_layout">Affichage</string>
-  <string name="p_layout_cellphone">Scientifique (téléphone portable)</string>
   <string name="p_layout_calculator">Scientifique</string>
   <string name="p_layout_calculator_mobile">Scientifique (gros boutons)</string>
   <string name="p_layout_simple">Simple</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Définit l\'affichage des boutons</string>
   <string name="c_calc_haptic_feedback_title">Retour tactile</string>
   <string name="c_calc_haptic_feedback_summary">Vibrations à l\'appui sur les boutons</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Désactivé</string>
   <string name="p_calc_haptic_feedback_strength_short">Court</string>
   <string name="p_calc_haptic_feedback_strength_middle">Moyen</string>
   <string name="p_calc_haptic_feedback_strength_long">Long</string>
-  <string name="p_calc_haptic_feedback_duration_title">Durée du retour tactile</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Durée des vibrations au clique d\'un bouton</string>
   <string name="empty_var_error">Impossible de créer une constante vide !</string>
   <string name="not_valid_result">Le résultat actuel n\'est pas valide !</string>
   <string name="c_plot_graph">Graphique</string>
   <string name="c_min_x_value">De</string>
   <string name="c_max_x_value">à</string>
-  <string name="c_swipe_distance">Distance à glisser pour les boutons</string>
-  <string name="c_swipe_distance_summary">Définissez la distance à glisser pour activer les fonctions secondaires d\'un bouton</string>
-  <string name="c_comment">Commentaire</string>
-  <string name="c_history_item_saved">Enregistré</string>
-  <string name="c_history_item_not_saved">Non enregistré</string>
   <string name="c_expression_copied">Expression mise en mémoire !</string>
-  <string name="c_history_item_status">Statut :</string>
-  <string name="c_history_item_comment">Commentaire :</string>
   <string name="c_use">Utilisation</string>
   <string name="c_use_short">Utilisation</string>
   <string name="c_copy_expression">Copier l\'expression</string>
   <string name="c_copy_result">Copier le résultat</string>
   <string name="c_history_expression">Valeur</string>
-  <string name="c_history_item_already_saved">Enregistré (voir l\'onglet \"Historique enregistré\")</string>
   <string name="c_history_comment">Commentaire</string>
   <string name="c_save_history">Enregistrer l\'historique</string>
   <string name="c_edit_history">Modifier l\'historique</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Copier la description</string>
   <string name="c_copy_value">Copier la valeur</string>
   <string name="c_first_start_text">Merci d\'avoir choisi Calculator++\n\nCalculator++ est un outil puissant pour faire des calculs quotidiens</string>
-  <string name="c_first_start_text_title">Bienvenue</string>
   <string name="c_calc_show_release_notes_title">Voir les notes à propos de la version</string>
   <string name="c_calc_show_release_notes_summary">Définit si la pop-up des informations à propos de la nouvelle version doit apparaître après une mise à jour.</string>
   <string name="c_calc_use_back_button_as_prev_summary">Définir le comportement du bouton Précédent</string>
@@ -152,12 +124,7 @@
   <string name="c_calc_ad_free_title">Soutenir le projet</string>
   <string name="c_calc_ad_free_summary">Et enlever la publicité</string>
   <string name="c_calc_already_purchased">La suppression de la publicité a été déjà achetée !</string>
-  <string name="c_calc_purchasing">Achat...</string>
-  <string name="c_calc_clearing">Effacement&#8230;</string>
-  <string name="c_feedback_title">Vos commentaires</string>
   <string name="c_feedback_text">Vous utilisez Calculator++ depuis un moment \n et c\'est important pour nous de connaitre votre avis à propos de l\'application. \n\n Votez pour Calculator++ \n sur <a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n et laissez un commentaire or\ndiscuter de l\'application\non<a href="http://facebook.com/calculatorpp">Facebook</a></string>
-  <string name="c_notespp_announce_text">Bonne nouvelle - J\'ai juste réalisé une nouvelle application pour Android appelée <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-Si vous êtes intéressé pour prendre vos notes de manière facile et rapide, rendez vous sur le <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">lien</a> et essayez Notes++ !</string>
   <string name="c_angle_units_changed_to">L\'unité d\'angle a été changé en \'%s\' !</string>
   <string name="c_numeral_base_changed_to">La base numérique a été changé \'%s\' !</string>
   <string name="c_conversion_tool">Outil de conversion</string>
@@ -170,16 +137,7 @@ Si vous êtes intéressé pour prendre vos notes de manière facile et rapide, r
   <string name="other">Autre</string>
   <string name="derivatives">Dérivation/Intégration</string>
   <string name="crashed">Calculator++ a craché&#8230;</string>
-  <string name="crash_dialog_title">Rapport de plantage de Calculator++</string>
-  <string name="crash_dialog_text">Malheureusement, Calcultator++ a planté.\n\n Pour résoudre le problème nous avons besoin de quelques informations à ce sujet. Il est fortement recommandé d\'envoyer un rapport par email (après avoir appuyé sur le bouton « Ok », vous verrez toutes les données à envoyer dans une nouvelle fenêtre).\n\n 
-Vous voulez envoyer un rapport d\'erreur ?</string>
   <string name="prefs_graph_screen_title">Options des graphiques</string>
-  <string name="prefs_graph_interpolate_function">Interpoler le graphique de la fonction</string>
-  <string name="prefs_graph_interpolate_function_summary">Si coché, l\'interpolation cubique sera utilisée pour les tracés des graphes de fonction</string>
-  <string name="prefs_graph_real_color_title">Couleur de la partie réelle du graphique des fonctions</string>
-  <string name="prefs_graph_real_color_summary">Définit la couleur du graphe de la partie réelle des fonctions</string>
-  <string name="prefs_graph_imag_color_title">Couleur de la partie imaginaire du graphique des fonctions</string>
-  <string name="prefs_graph_imag_color_summary">Définit la couleur du graphe de la partie imaginaire des fonctions</string>
   <string name="p_white_line_color">Blanc</string>
   <string name="p_grey_line_color">Gris</string>
   <string name="p_red_line_color">Rouge</string>
@@ -199,7 +157,6 @@ Vous voulez envoyer un rapport d\'erreur ?</string>
   <string name="empty_function_error">Impossible de créer une fonction vide !</string>
   <string name="do_not_show_messages_in_session">Ne plus afficher ce message jusqu\'à la prochaine session</string>
   <string name="calculation_messages_dialog_title">Calculatrice ++ avertissement</string>
-  <string name="arithmetic_error_while_plot">Une erreur d\'arithmétique s\'est produite pendant le traçage du graphe : %s</string>
   <string name="ok">Oui</string>
   <string name="p_show_calculation_messages_dialog_title">Afficher les messages de calcul dans la boîte de dialogue</string>
   <string name="p_show_calculation_messages_dialog_summary">Si coché, durant un calcul, les messages s\'afficheront dans une boite de dialogue spéciale</string>
@@ -221,7 +178,6 @@ Vous voulez envoyer un rapport d\'erreur ?</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_onscreen_remove_icon_message">Vous pouvez supprimer la seconde icône dans la liste des applications dans les paramètres de l\'application ou en appuyant sur le bouton suivant</string>
   <string name="cpp_this_change_may_require_reboot">Cette modification peut nécessiter le redémarrage</string>
   <string name="cpp_plot_2d">Tracé 2D</string>
   <string name="cpp_plot_3d">Tracé 3D</string>
@@ -265,9 +221,11 @@ et tout ce dont vous avez besoin est un compte Google correctement configuré.\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_purchase_thank_you_text">Merci de soutenir cette application! \n \n Cela peut prendre plusieurs
-minutes pour la validation de l\'achat. Vous pouvez toujours vérifier les informations sur l\'achat sur votre compte Google. \n
-Si vous avez des problèmes ou des questions, n\'hésitez pas à me contacter directement (Les informations sont disponibles dans Menu Principal-&gt; À propos)</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>
+  <string name="cpp_new_in_version">Nouveautés de la version %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Voulez vous essayer les nouveaux thèmes Material ? Choisissez dans la liste :</string>
 </resources>
diff --git a/android-app/src/main/res/values-it/text_strings.xml b/android-app/src/main/res/values-it/text_strings.xml
index 625b403a..637642a0 100644
--- a/android-app/src/main/res/values-it/text_strings.xml
+++ b/android-app/src/main/res/values-it/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calcolatrice++</string>
   <string name="c_app_name_on_screen">Calcolatrice++ (Modalità finestra)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Impostazioni</string>
-  <string name="c_syntax_error">Errore</string>
   <string name="c_result_copied">Il risultato è stato copiato negli appunti!</string>
   <string name="c_settings">Impostazioni</string>
   <string name="c_help">Aiuto</string>
   <string name="c_vars_and_constants">Variabili e costanti</string>
-  <string name="c_prefs_main_category">Impostazioni principali</string>
   <string name="c_prefs_calculations_category">Impostazioni calcolo</string>
   <string name="c_prefs_appearance_category">Impostazioni aspetto</string>
   <string name="c_prefs_other_category">Altre impostazioni</string>
-  <string name="c_prefs_drag_button_category">Impostazioni trascinamento tasti</string>
-  <string name="c_down">Giù</string>
-  <string name="c_up">Su</string>
-  <string name="c_restart">Riavvia</string>
   <string name="c_undo">annulla</string>
   <string name="c_redo">rifai</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">incolla</string>
   <string name="c_vars">variabili</string>
   <string name="c_copy">Copiare</string>
   <string name="c_plot">Plot grafico</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Tempo massimo di calcolo</string>
   <string name="p_calc_max_calculation_time_summary">Se i calcoli superano il limite specificato - la calcolatrice si ferma con un errore</string>
   <string name="c_exit">Esci</string>
-  <string name="c_add">Aggiungi</string>
   <string name="c_cancel">Annulla</string>
   <string name="c_save">Salva</string>
   <string name="c_remove">Rimuovi</string>
@@ -55,14 +46,9 @@
   <string name="c_name_is_not_valid">Il nome della costante non è valido: il nome deve iniziare con una lettera, può
 		contenere lettere, cifre e underscore.
 	</string>
-  <string name="c_sys_var_cannot_be_changed">La variabile di sistema non può essere cambiata!</string>
   <string name="c_calc_editor_hint">Inserisci una nuova espressione</string>
-  <string name="c_press_to_copy">Premi per copiare</string>
-  <string name="c_continue">Continua</string>
   <string name="c_history">Cronologia</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">La cronologia è vuota!</string>
-  <string name="c_app_history">Cronologia</string>
   <string name="c_char_is_not_accepted">Il carattere \'%s\' non è accettato come nome di variabile!</string>
   <string name="c_calc_angle_units">Unità angoli</string>
   <string name="p_deg">Gradi</string>
@@ -78,12 +64,11 @@
   <string name="p_oct">Ottale</string>
   <string name="p_bin">Binario</string>
   <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Predefinito</string>
-  <string name="p_violet_theme">Viola</string>
-  <string name="p_light_blue_theme">Blu chiaro</string>
   <string name="p_metro_blue_theme">Metro Blue</string>
   <string name="p_metro_green_theme">Metro Green</string>
   <string name="p_metro_purple_theme">Metro Purple</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Precisione del risultato (tutti i calcoli sono fatti con la massima
 		precisione, indipendentemente dal valore di questa opzione)
 	</string>
@@ -91,9 +76,7 @@
 		calcolatrice
 	</string>
   <string name="c_calc_theme_summary">Imposta il tema per la calcolatrice</string>
-  <string name="c_clear_history">Cancella cronologia</string>
   <string name="c_toggle_datetime">Mostra/nascondi data</string>
-  <string name="c_simplify_instead_of_numeric">Le prossime costanti sono indefinite: {0}!</string>
   <string name="p_grouping_separator_no">Nessun separatore</string>
   <string name="p_grouping_separator_apostrophe">Apostrofo (\')</string>
   <string name="p_grouping_separator_space">Spazio ( )</string>
@@ -102,7 +85,6 @@
   <string name="c_calc_multiplication_sign">Segno di moltiplicazione</string>
   <string name="c_calc_multiplication_sign_summary">Imposta segno di moltiplicazione</string>
   <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_cellphone">Cellulare</string>
   <string name="p_layout_calculator">Calcolatrice</string>
   <string name="p_layout_calculator_mobile">Scientifico (tasti grandi)</string>
   <string name="p_layout_simple">Semplice</string>
@@ -110,31 +92,21 @@
   <string name="c_calc_layout_summary">Imposta layout per i pulsanti</string>
   <string name="c_calc_haptic_feedback_title">Feedback tattile</string>
   <string name="c_calc_haptic_feedback_summary">Attiva o disattiva la vibrazione su click dei pulsanti</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Breve</string>
   <string name="p_calc_haptic_feedback_strength_middle">Media</string>
   <string name="p_calc_haptic_feedback_strength_long">Lunga</string>
-  <string name="p_calc_haptic_feedback_duration_title">Durata feedback tattile</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Durata della vibrazione su click dei pulsanti</string>
   <string name="empty_var_error">Impossibile creare una costante vuota!</string>
   <string name="not_valid_result">Risultato attuale non valido!</string>
   <string name="c_plot_graph">Grafico</string>
   <string name="c_min_x_value">Da</string>
   <string name="c_max_x_value">A</string>
-  <string name="c_swipe_distance">Swipe distanza per i pulsanti</string>
-  <string name="c_swipe_distance_summary">Imposta distanza swipe per i pulsanti che supportano azioni swipe supplementari
-	</string>
-  <string name="c_comment">Commento</string>
-  <string name="c_history_item_saved">Salvato</string>
-  <string name="c_history_item_not_saved">Non salvato</string>
   <string name="c_expression_copied">Espressione copiato negli appunti!</string>
-  <string name="c_history_item_status">Stato:</string>
-  <string name="c_history_item_comment">Commento:</string>
   <string name="c_use">Uso</string>
   <string name="c_use_short">Uso</string>
   <string name="c_copy_expression">Copia espressione</string>
   <string name="c_copy_result">Copia risultato</string>
   <string name="c_history_expression">Valore</string>
-  <string name="c_history_item_already_saved">Salvata (vedi scheda \'Storia salvate\')</string>
   <string name="c_history_comment">Commento</string>
   <string name="c_save_history">Salva storia</string>
   <string name="c_edit_history">Modificare la storia</string>
@@ -147,7 +119,6 @@
   <string name="c_copy_description">Сopia descrizione</string>
   <string name="c_copy_value">Сopia il valore</string>
   <string name="c_first_start_text">Grazie per aver scelto Calculator++!\n\nCalculator++ è un potente strumento per fare calcoli ogni giorno.</string>
-  <string name="c_first_start_text_title">Benvenuti</string>
   <string name="c_calc_show_release_notes_title">Visualizza le note di versione</string>
   <string name="c_calc_show_release_notes_summary">Definisce se la finestra popup delle note di versione debba comparire dopo l\'aggiornamento alla nuova versione</string>
   <string name="c_calc_use_back_button_as_prev_summary">Definisce il comportamento del pulsante Indietro</string>
@@ -160,13 +131,9 @@
   <string name="c_calc_ad_free_title">Supportare il progetto</string>
   <string name="c_calc_ad_free_summary">E rimuovere la pubblicità</string>
   <string name="c_calc_already_purchased">L\'opzione di rimozione annunci pubblicitari è stata già acquistata!</string>
-  <string name="c_calc_purchasing">Acquisto in corso&#8230;</string>
-  <string name="c_calc_clearing">Pulizia in corso&#8230;</string>
-  <string name="c_feedback_title">Commenti</string>
   <string name="c_feedback_text">State usando Calculator++ da un po\' di tempo\n
 ed è importante per noi conoscere la vostra opinione sull\'applicazione.\n\n
 Per favore valutate Calculator++ \nsu <a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n lasciate un commento o \npartecipate alla discussione sull\'applicazione \nsu <a href="http://facebook.com/calculatorpp"> Facebook</a></string>
-  <string name="c_notespp_announce_text">Buone notizie - ho appena rilasciato una nuova applicazione per Android chiamata <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\nSe siete interessati ad un modo facile e veloce per prendere note e appunti per favore seguite il  <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">collegamento</a> e provate Notes++!</string>
   <string name="c_angle_units_changed_to">Le unità di misura per gli angoli sono state impostate su \'%s\'!</string>
   <string name="c_numeral_base_changed_to">La base per i numeri è stata impostata su \'%s\'!</string>
   <string name="c_conversion_tool">Strumenti di conversione</string>
@@ -179,17 +146,7 @@ Per favore valutate Calculator++ \nsu <a href="https://market.android.com/detail
   <string name="other">Altri</string>
   <string name="derivatives">Derivate/Integrali</string>
   <string name="crashed">Calculator++ è andato in crash&#8230;</string>
-  <string name="crash_dialog_title">Rapporto crash di Calculator++</string>
-  <string name="crash_dialog_text">  Sfortunatamente, Calculator + + si è chiuso.\n\n
-Per risolvere il problema, abbiamo bisogno di alcune informazioni. E\' altamente consigliato inviare un report via e-mail (dopo aver premuto il tasto \'Ok\' vedrete tutti inviati dati in una nuova finestra).\n\n 
-Vuoi inviare un report? </string>
   <string name="prefs_graph_screen_title">impostazioni grafici</string>
-  <string name="prefs_graph_interpolate_function">Grafico della funzione interpolata</string>
-  <string name="prefs_graph_interpolate_function_summary">Se selezionata,  l\'interpolazione cubica verrà usata nel disegno del grafico</string>
-  <string name="prefs_graph_real_color_title">Colore della parte reale del grafico della funzione</string>
-  <string name="prefs_graph_real_color_summary">Imposta i colori della parte reale del grafico della funzione</string>
-  <string name="prefs_graph_imag_color_title">Colore della parte immaginaria del grafico della funzione</string>
-  <string name="prefs_graph_imag_color_summary">Imposta il colore della parte immaginaria del grafico della funzione</string>
   <string name="p_white_line_color">Bianco</string>
   <string name="p_grey_line_color">Grigio</string>
   <string name="p_red_line_color">Rosso</string>
@@ -209,7 +166,6 @@ Vuoi inviare un report? </string>
   <string name="empty_function_error"> Impassibile creare funzioni con argomento nullo!</string>
   <string name="do_not_show_messages_in_session">Non mostrare questo messaggio fino alla prossima sessione</string>
   <string name="calculation_messages_dialog_title">Avvertimento di calculator++</string>
-  <string name="arithmetic_error_while_plot">Un errore  aritmetico è avvenuto nel rappresentare il grafico di: %s</string>
   <string name="ok">Ok</string>
   <string name="p_show_calculation_messages_dialog_title">Mostra i messaggi del calcolo nella finestra</string>
   <string name="p_show_calculation_messages_dialog_summary">Se attivato, qualsiasi messaggio relativo ai calcoli sarà mostrato in una finestra apposita</string>
@@ -231,7 +187,6 @@ Vuoi inviare un report? </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_onscreen_remove_icon_message">È possibile rimuovere la seconda icona nella lista delle applicazioni, nelle impostazioni dell\'applicazione o premendo il pulsante avanti</string>
   <string name="cpp_this_change_may_require_reboot">Questo cambiamento potrebbe richiedere il riavvio</string>
   <string name="cpp_plot_2d">Grafico 2D</string>
   <string name="cpp_plot_3d">Grafico 3D</string>
@@ -274,9 +229,11 @@ Vuoi inviare un report? </string>
 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_purchase_thank_you_text">Grazie per il supporto a questa applicazione!
-Potrebbero servire alcuno minuti prima che l\'applicazione venga informata dell\'acquisto. Puoi sempre verificare le informazioni sul pagamento nel tuo account Google. 
-In caso di problemi o domande puoi contattare direttamente me(i contatto sono disponibili in main->menu->about)</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">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-ja/text_strings.xml b/android-app/src/main/res/values-ja/text_strings.xml
index 2f3affd4..30e11895 100644
--- a/android-app/src/main/res/values-ja/text_strings.xml
+++ b/android-app/src/main/res/values-ja/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (ウィンドウモード)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">設定</string>
-  <string name="c_syntax_error">エラー</string>
   <string name="c_result_copied">計算結果をクリップボードにコピーしました！</string>
   <string name="c_settings">設定</string>
   <string name="c_help">ヘルプ</string>
   <string name="c_vars_and_constants">変数と定数</string>
-  <string name="c_prefs_main_category">メイン設定</string>
   <string name="c_prefs_calculations_category">計算の設定</string>
   <string name="c_prefs_appearance_category">外観の設定</string>
   <string name="c_prefs_other_category">その他の設定</string>
-  <string name="c_prefs_drag_button_category">ドラッグボタンの設定</string>
-  <string name="c_down">下</string>
-  <string name="c_up">上</string>
-  <string name="c_restart">再開</string>
   <string name="c_undo">元に戻す</string>
   <string name="c_redo">やり直し</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">貼り付け</string>
   <string name="c_vars">変数</string>
   <string name="c_copy">コピー</string>
   <string name="c_plot">グラフをプロット</string>
@@ -38,7 +30,6 @@
   <string name="p_calc_max_calculation_time_title">計算時間の限界値</string>
   <string name="p_calc_max_calculation_time_summary">指定した限界を超えて計算が続いた場合 - エラーを表示して計算を中止します</string>
   <string name="c_exit">終了</string>
-  <string name="c_add">追加</string>
   <string name="c_cancel">取消</string>
   <string name="c_save">保存</string>
   <string name="c_remove">削除</string>
@@ -55,14 +46,9 @@
   <string name="c_var_name_clashes">変数名が関数名とかぶっています</string>
   <string name="c_var_already_exists">同じ名前の変数がすでに存在しています!</string>
   <string name="c_name_is_not_valid">定数の名前が正しくありません: 名前は文字で始める必要があり、文字、数字、アンダースコアを含めることができます。</string>
-  <string name="c_sys_var_cannot_be_changed">システム変数を変更することはできません!</string>
   <string name="c_calc_editor_hint">式を入力してください</string>
-  <string name="c_press_to_copy">押すとコピーします</string>
-  <string name="c_continue">続行</string>
   <string name="c_history">履歴</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">履歴はありません!</string>
-  <string name="c_app_history">履歴</string>
   <string name="c_char_is_not_accepted">文字\'%s\'は変数名として利用できません!</string>
   <string name="c_calc_angle_units">現在の角度の単位</string>
   <string name="p_deg">度</string>
@@ -77,18 +63,15 @@
   <string name="p_oct">8進法</string>
   <string name="p_bin">2進法</string>
   <string name="c_calc_theme">テーマ</string>
-  <string name="p_default_theme">グレー</string>
-  <string name="p_violet_theme">バイオレット</string>
-  <string name="p_light_blue_theme">ライトブルー</string>
   <string name="p_metro_blue_theme">メトロブルー</string>
   <string name="p_metro_green_theme">メトログリーン</string>
   <string name="p_metro_purple_theme">メトロパープル</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">計算結果の有効桁数(計算はこの設定に関係なく最大精度で行われます)</string>
   <string name="c_calc_color_display_summary">電卓エディタの色とスタイルを切り替えます</string>
   <string name="c_calc_theme_summary">電卓のテーマを設定します</string>
-  <string name="c_clear_history">履歴のクリア</string>
   <string name="c_toggle_datetime">日付の表示/非表示</string>
-  <string name="c_simplify_instead_of_numeric">次の定数は定義されていません: {0}</string>
   <string name="p_grouping_separator_no">区切り記号なし</string>
   <string name="p_grouping_separator_apostrophe">アポストロフィ (\')</string>
   <string name="p_grouping_separator_space">スペース( )</string>
@@ -97,7 +80,6 @@
   <string name="c_calc_multiplication_sign">掛け算の記号</string>
   <string name="c_calc_multiplication_sign_summary">掛け算の記号を設定します</string>
   <string name="c_calc_layout">レイアウト</string>
-  <string name="p_layout_cellphone">科学 (携帯)</string>
   <string name="p_layout_calculator">科学</string>
   <string name="p_layout_calculator_mobile">科学(大きなボタン)</string>
   <string name="p_layout_simple">シンプル</string>
@@ -105,31 +87,22 @@
   <string name="c_calc_layout_summary">ボタンのレイアウトを設定します</string>
   <string name="c_calc_haptic_feedback_title">入力時バイブ</string>
   <string name="c_calc_haptic_feedback_summary">ボタンを押した時のバイブレーションの設定をします</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">短め</string>
   <string name="p_calc_haptic_feedback_strength_middle">中</string>
   <string name="p_calc_haptic_feedback_strength_long">長め</string>
-  <string name="p_calc_haptic_feedback_duration_title">入力時バイブの長さ</string>
-  <string name="p_calc_haptic_feedback_duration_summary">ボタンを押した時のバイブレーションの長さを設定します</string>
   <string name="empty_var_error">空の定数は作成できません!
 </string>
   <string name="not_valid_result">現在の結果が正しくありません!</string>
   <string name="c_plot_graph">グラフ</string>
   <string name="c_min_x_value">ここから</string>
   <string name="c_max_x_value">ここまで</string>
-  <string name="c_swipe_distance">ボタンのスワイプ距離</string>
-  <string name="c_swipe_distance_summary">スワイプアクションの際のボタンをどれだけスワイプするかの設定をします</string>
-  <string name="c_comment">コメント</string>
-  <string name="c_history_item_saved">保存しました</string>
-  <string name="c_history_item_not_saved">保存されていません</string>
   <string name="c_expression_copied">式をクリップボードにコピーしました!</string>
-  <string name="c_history_item_status">ステータス:</string>
-  <string name="c_history_item_comment">コメント:</string>
   <string name="c_use">使う</string>
   <string name="c_use_short">使う</string>
   <string name="c_copy_expression">式をコピー</string>
   <string name="c_copy_result">結果をコピー</string>
   <string name="c_history_expression">値</string>
-  <string name="c_history_item_already_saved">保存されました(\'保存された履歴\'を参照してください)</string>
   <string name="c_history_comment">コメント</string>
   <string name="c_save_history">履歴を保存</string>
   <string name="c_edit_history">履歴を編集</string>
@@ -143,7 +116,6 @@
   <string name="c_copy_description">説明をコピー</string>
   <string name="c_copy_value">値のコピー</string>
   <string name="c_first_start_text">Calculator++をお選びいただきありがとうございます!\n\nCalculator++は日々の計算に使える強力なツールです。</string>
-  <string name="c_first_start_text_title">ようこそ</string>
   <string name="c_calc_show_release_notes_title">リリースノートを表示します</string>
   <string name="c_calc_show_release_notes_summary">新しいバージョンに更新した際にリリースノートを表示するかどうか設定します</string>
   <string name="c_calc_use_back_button_as_prev_summary">戻るボタンの振る舞いを定義します</string>
@@ -156,19 +128,12 @@
   <string name="c_calc_ad_free_title">プロジェクトを支援します</string>
   <string name="c_calc_ad_free_summary">広告を削除</string>
   <string name="c_calc_already_purchased">広告削除オプションはすでに購入されています!</string>
-  <string name="c_calc_purchasing">購入しています&#8230;</string>
-  <string name="c_calc_clearing">クリア中&#8230;</string>
-  <string name="c_feedback_title">フィードバック</string>
   <string name="c_feedback_text">Calculator++をお使いいただきありがとうございます。 \n
 		アプリに対してのあなたの意見は私達にとって非常に有用なものとなります。\n\n
 		Calculator++を<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 			Google Play</a>\nで評価し、\n<a href="http://facebook.com/calculatorpp">Facebook</a>\nでアプリケーションに関するコメントを残してください\n
 		
 	</string>
-  <string name="c_notespp_announce_text">お知らせ - <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>というアプリを公開しました。\n
-		もし素早く簡単にノートを取る方法に興味がお有りであれば、
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">こちら</a>でNotes++を試してみてください!
-	</string>
   <string name="c_angle_units_changed_to">角度の単位は\'%s\'に変更されました!</string>
   <string name="c_numeral_base_changed_to">進法が\'%s\'に変更されました!</string>
   <string name="c_conversion_tool">変換ツール</string>
@@ -181,19 +146,7 @@
   <string name="other">その他</string>
   <string name="derivatives">微分・積分</string>
   <string name="crashed">Calculator++はクラッシュしました&#8230;</string>
-  <string name="crash_dialog_title">Calculator++クラッシュレポート</string>
-  <string name="crash_dialog_text">		申し訳ありませんが、Calculator++はクラッシュしました。\n\n
-		この問題を解決するためには、情報が必要です。クラッシュレポートをメールにて送っていただくことを非常に強くおすすめします。
-		(\'Ok\'ボタンを押すと新しいウィンドウが開き、送信しようとしているすべてのデータを確認することができます)\n\n
-		クラッシュレポートを送信してもよろしいでしょうか?
-	</string>
   <string name="prefs_graph_screen_title">グラフの設定</string>
-  <string name="prefs_graph_interpolate_function">関数グラフの補完</string>
-  <string name="prefs_graph_interpolate_function_summary">チェックすると関数グラフの描写にキュービック補間法が利用されます</string>
-  <string name="prefs_graph_real_color_title">関数グラフの実数部分の色</string>
-  <string name="prefs_graph_real_color_summary">関数グラフの実数部分の色を設定します</string>
-  <string name="prefs_graph_imag_color_title">関数グラフの虚数部の色</string>
-  <string name="prefs_graph_imag_color_summary">関数グラフの虚数部分の色を設定します</string>
   <string name="p_white_line_color">白</string>
   <string name="p_grey_line_color">グレー</string>
   <string name="p_red_line_color">赤</string>
@@ -213,7 +166,6 @@
   <string name="empty_function_error">空の関数を作成することはできません！</string>
   <string name="do_not_show_messages_in_session">次のセッションまでこのメッセージを表示しません</string>
   <string name="calculation_messages_dialog_title">Calculator++警告</string>
-  <string name="arithmetic_error_while_plot">プロット中に算術エラーが発生しました: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">ダイアログで計算メッセージを表示します</string>
   <string name="p_show_calculation_messages_dialog_summary">有効にすると、計算中に何かメッセージが発生した場合、ダイアログが表示されます</string>
@@ -235,7 +187,6 @@
   <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_onscreen_remove_icon_message">２つ目のアイコンは設定から、もしくは次へボタンを押すことでアプリのリストから取り除くことができます</string>
   <string name="cpp_this_change_may_require_reboot">この変更は再起動を必要とします</string>
   <string name="cpp_plot_2d">2D プロット</string>
   <string name="cpp_plot_3d">3D プロット</string>
@@ -246,7 +197,7 @@
   <string name="cpp_color_map_line_color_type">カラーマップ (3Dのみ)</string>
   <string name="cpp_solid_line_style">実線 (-----)</string>
   <string name="cpp_dashed_line_style">破線 (- - -)</string>
-  <string name="cpp_dotted_line_style">点線 (...)</string>
+  <string name="cpp_dotted_line_style">点線 (. . .)</string>
   <string name="cpp_dash_dotted_line_style">ドット破線 (-.-.-）</string>
   <string name="cpp_plotter">関数プロッター</string>
   <string name="cpp_plot_screenshot">スクリーンショットを撮る</string>
@@ -279,10 +230,11 @@
 		 \'続ける\'を選択すると、Google Playストアに接続され、支払いを行うことが出来ます。
 	</string>
   <string name="cpp_purchase_title">購入</string>
-  <string name="cpp_purchase_thank_you_text">アプリを支援いだだき、ありがとうございました!\n\nアプリが購入したという情報を知らされるまでしばらくかかります。購入情報はいつでもあなたのGoogleアカウントで確認できます。\n
-		もし問題やご質問等ございましたら、お気軽に直接私にご連絡ください。(連絡先は
-		メイン-&gt;メニュー-&gt;アプリについて にあります。)
-	</string>
   <string name="cpp_var_show_greek_keyboard">ギリシャ語の文字を表示します。</string>
   <string name="cpp_var_hide_greek_keyboard">ギリシャ文字を非表示します。</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-nl/text_strings.xml b/android-app/src/main/res/values-nl/text_strings.xml
index a01f2170..98e839c9 100644
--- a/android-app/src/main/res/values-nl/text_strings.xml
+++ b/android-app/src/main/res/values-nl/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Instellingen</string>
-  <string name="c_syntax_error">Fout</string>
   <string name="c_result_copied">Resultaat is gekopieerd naar het klembord!</string>
   <string name="c_settings">Instellingen</string>
   <string name="c_help">Help</string>
   <string name="c_vars_and_constants">Variabelen en constanten</string>
-  <string name="c_prefs_main_category">Hoofdinstellingen</string>
   <string name="c_prefs_calculations_category">Instellingen voor berekeningen</string>
   <string name="c_prefs_appearance_category">Weergave-instellingen</string>
   <string name="c_prefs_other_category">Andere instellingen</string>
-  <string name="c_prefs_drag_button_category">Sleepknoppen instellingen</string>
-  <string name="c_down">Omlaag</string>
-  <string name="c_up">Omhoog</string>
-  <string name="c_restart">Herstarten</string>
   <string name="c_undo">ongedaan maken</string>
   <string name="c_redo">opnieuw uitvoeren</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">plakken</string>
   <string name="c_vars">vars</string>
   <string name="c_copy">Kopiëren</string>
   <string name="c_plot">Uitzetten van grafiek</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Maximale berekeningstijd</string>
   <string name="p_calc_max_calculation_time_summary">Als berekeningen opgegeven limiet overschrijden stopt de rekenmachine met een foutmelding</string>
   <string name="c_exit">Verlaten</string>
-  <string name="c_add">Toevoegen</string>
   <string name="c_cancel">Annuleren</string>
   <string name="c_save">Opslaan</string>
   <string name="c_remove">Verwijderen</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Naam van de variabele is in conflict met de naam van de functie!</string>
   <string name="c_var_already_exists">Variabele met dezelfde naam bestaat al!</string>
   <string name="c_name_is_not_valid">Naam van de constante is niet geldig: naam moet beginnen met een letter, kan letters, cijfers en underscores bevatten. </string>
-  <string name="c_sys_var_cannot_be_changed">Systeemvariabele kan niet worden gewijzigd!</string>
   <string name="c_calc_editor_hint">Voer nieuwe uitdrukking in</string>
-  <string name="c_press_to_copy">Druk op om te kopiëren</string>
-  <string name="c_continue">Volgende</string>
   <string name="c_history">Geschiedenis</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Geschiedenis is leeg!</string>
-  <string name="c_app_history">Geschiedenis</string>
   <string name="c_char_is_not_accepted">Teken \'%s\' is niet geaccepteerd in naam van de variabele!</string>
   <string name="c_calc_angle_units">Huidige hoekeenheden</string>
   <string name="p_deg">Graden</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Octaal</string>
   <string name="p_bin">Binair</string>
   <string name="c_calc_theme">Thema</string>
-  <string name="p_default_theme">Grijs</string>
-  <string name="p_violet_theme">Violet</string>
-  <string name="p_light_blue_theme">Lichtblauw</string>
   <string name="p_metro_blue_theme">Metro blauw</string>
   <string name="p_metro_green_theme">Metro groen</string>
   <string name="p_metro_purple_theme">Metro paars</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Nauwkeurigheid van de uitkomst (alle berekeningen worden gedaan met maximale nauwkeurigheid, onafhankelijk van deze optie)</string>
   <string name="c_calc_color_display_summary">Wisselt kleur en stijl in de calculator editor</string>
   <string name="c_calc_theme_summary">Hiermee stelt u het thema voor de calculator in</string>
-  <string name="c_clear_history">Geschiedenis wissen</string>
   <string name="c_toggle_datetime">Datum weergeven/verbergen</string>
-  <string name="c_simplify_instead_of_numeric">Volgende constanten zijn ongedefinieerd: {0}!</string>
   <string name="p_grouping_separator_no">Geen groeperingsscheidingsteken</string>
   <string name="p_grouping_separator_apostrophe">Apostrof (\')</string>
   <string name="p_grouping_separator_space">Spatie ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Vermenigvuldigingsteken</string>
   <string name="c_calc_multiplication_sign_summary">Hiermee stelt u vermenigvuldigingsteken in</string>
   <string name="c_calc_layout">Lay-out</string>
-  <string name="p_layout_cellphone">Wetenschappelijk (mobiel)</string>
   <string name="p_layout_calculator">Wetenschappelijk</string>
   <string name="p_layout_calculator_mobile">Wetenschappelijke (grote knoppen)</string>
   <string name="p_layout_simple">Eenvoudig</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Configureert het uiterlijk van de knoppen</string>
   <string name="c_calc_haptic_feedback_title">Trilsignaal feedback</string>
   <string name="c_calc_haptic_feedback_summary">Zet trillen bij aanraken knoppen aan/uit</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Kort</string>
   <string name="p_calc_haptic_feedback_strength_middle">Medium</string>
   <string name="p_calc_haptic_feedback_strength_long">Lang</string>
-  <string name="p_calc_haptic_feedback_duration_title">Duur trilsignaal</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Tijdsduur trillen bij aanraken knoppen</string>
   <string name="empty_var_error">Niet in staat een lege constante te creëren!</string>
   <string name="not_valid_result">Huidige resultaat is niet geldig!</string>
   <string name="c_plot_graph">Grafiek</string>
   <string name="c_min_x_value">Van</string>
   <string name="c_max_x_value">Aan</string>
-  <string name="c_swipe_distance">Veeg afstand voor knoppen</string>
-  <string name="c_swipe_distance_summary">Configureert veeg afstand voor knoppen die aanvullende veeg acties ondersteunen</string>
-  <string name="c_comment">Opmerking</string>
-  <string name="c_history_item_saved">Opgeslagen</string>
-  <string name="c_history_item_not_saved">Niet opgeslagen</string>
   <string name="c_expression_copied">Uitdrukking naar het klembord gekopieerd!</string>
-  <string name="c_history_item_status">Status:</string>
-  <string name="c_history_item_comment">COMMENT:</string>
   <string name="c_use">Gebruik</string>
   <string name="c_use_short">Gebruik</string>
   <string name="c_copy_expression">Kopieer expressie</string>
   <string name="c_copy_result">Kopieeer resultaat</string>
   <string name="c_history_expression">Waarde</string>
-  <string name="c_history_item_already_saved">Opgeslagen (zie \'Opgeslagen geschiedenis\' tabblad)</string>
   <string name="c_history_comment">Opmerkingen</string>
   <string name="c_save_history">Geschiedenis opslaan</string>
   <string name="c_edit_history">Geschiedenis wijzigen</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Beschrijving kopiëren</string>
   <string name="c_copy_value">Waarde kopiëren</string>
   <string name="c_first_start_text">Dank u voor het kiezen van Calculator ++! \n\nCalculator++ is een krachtig hulpmiddel voor het maken van alledaagse berekeningen. </string>
-  <string name="c_first_start_text_title">Welkom</string>
   <string name="c_calc_show_release_notes_title">Toon release notities</string>
   <string name="c_calc_show_release_notes_summary">Bepaalt of versiewijzigingen popup scherm moet verschijnen na update naar de nieuwe versie</string>
   <string name="c_calc_use_back_button_as_prev_summary">Bepaalt het gedrag van de Terug knop</string>
@@ -152,16 +124,7 @@
   <string name="c_calc_ad_free_title">Ondersteun het project</string>
   <string name="c_calc_ad_free_summary">En verwijder de advertenties</string>
   <string name="c_calc_already_purchased">Advertentie vrije optie is al aangekocht!</string>
-  <string name="c_calc_purchasing">Aankopen&#8230;</string>
-  <string name="c_calc_clearing">Bezig met verwijderen&#8230;</string>
-  <string name="c_feedback_title">Feedback</string>
   <string name="c_feedback_text">Je gebruikt Calculator++ nu al een tijdje \n en het is belangrijk voor ons om jouw mening te weten over de app.\n\n Beoordeel Calculator++ alsjeblieft \nop<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>,\n laat een reactie achter of \npraat over de app \nop <a href="http://facebook.com/calculatorpp">Facebook </a></string>
-  <string name="c_notespp_announce_text">Goed nieuws -  een nieuwe app is beschikbaar voor android:
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-		Ben je op zoek bent naar een snelle en eenvoudige manier voor het maken van notities volg dan de
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
-		en probeer Notes++!
-	</string>
   <string name="c_angle_units_changed_to">Eenheid voor hoeken is gewijzigd naar \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Groeten is gewijzigd naar \'%s\'!</string>
   <string name="c_conversion_tool">Conversietool</string>
@@ -174,19 +137,7 @@
   <string name="other">Andere</string>
   <string name="derivatives">Afgeleiden/integralen</string>
   <string name="crashed">Rekenmachine ++ is vastgelopen&#8230;</string>
-  <string name="crash_dialog_title">Rekenmachine ++ crashverslag</string>
-  <string name="crash_dialog_text">Helaas is Calculator++ gecrashed. \n\n
-Help ons de oorzaak te vinden door een crashrapport te verzenden via 
-email (door op \'Ok\'  te drukken kunt u de verzonden gegevens raadplegen in een nieuw venster).\n\n
-		Wilt u een crashrapport verzenden?
-	</string>
   <string name="prefs_graph_screen_title">Grafiekinstellingen</string>
-  <string name="prefs_graph_interpolate_function">Interpolatie van de functiegrafiek</string>
-  <string name="prefs_graph_interpolate_function_summary">Indien aangevinkt zal kubieke interpolatie gebruikt worden voor het genereren van grafieken</string>
-  <string name="prefs_graph_real_color_title">Kleur van  de grafiek in het reële domein</string>
-  <string name="prefs_graph_real_color_summary">Hiermee stelt u de kleur in van de functie in het reële domein</string>
-  <string name="prefs_graph_imag_color_title">Kleur van het imaginaire deel van de functie</string>
-  <string name="prefs_graph_imag_color_summary">Stelt de kleur in van het grafiekjes in het imaginaire domein</string>
   <string name="p_white_line_color">Wit</string>
   <string name="p_grey_line_color">Grijs</string>
   <string name="p_red_line_color">Rood</string>
@@ -206,7 +157,6 @@ email (door op \'Ok\'  te drukken kunt u de verzonden gegevens raadplegen in een
   <string name="empty_function_error">Niet mogelijk om een lege functie te maken!</string>
   <string name="do_not_show_messages_in_session">Dit bericht niet meer weergeven tot de volgende sessie</string>
   <string name="calculation_messages_dialog_title">Calculator++ waarschuwing</string>
-  <string name="arithmetic_error_while_plot">Rekenkundige fout bij het plotten: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Berekeningen weergeven in een dialoogvenster</string>
   <string name="p_show_calculation_messages_dialog_summary">Indien ingeschakeld wanneer een bericht is opgetreden tijdens berekeningen zal een speciaal dialoogvenster worden getoond</string>
@@ -230,7 +180,6 @@ email (door op \'Ok\'  te drukken kunt u de verzonden gegevens raadplegen in een
   <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_onscreen_remove_icon_message">U kunt het tweede pictogram verwijderen uit de app lijst via applicatie instellingen of door op volgende te drukken</string>
   <string name="cpp_this_change_may_require_reboot">Deze wijziging vereist mogelijks opnieuw op te starten</string>
   <string name="cpp_plot_2d">2D plot</string>
   <string name="cpp_plot_3d">3D plot</string>
@@ -273,9 +222,11 @@ email (door op \'Ok\'  te drukken kunt u de verzonden gegevens raadplegen in een
 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_purchase_thank_you_text">Hartelijk bedankt voor het steunen van de app!\n\n Het kan enige minuten duren voor de app uw betaling herkend. U kan steeds uw Google account raadplegen om de informatie van uw betaling na te kijken.\n
-Indien u problemen ondervindt of vragen hebt, aarzel dan niet om mij te contactereny (contactgegevens vindt u in
-Main-&gt;Menu-&gt;Over)</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">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-pl/text_strings.xml b/android-app/src/main/res/values-pl/text_strings.xml
index cc861c54..c00ad246 100644
--- a/android-app/src/main/res/values-pl/text_strings.xml
+++ b/android-app/src/main/res/values-pl/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (tryb okna)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Ustawienia</string>
-  <string name="c_syntax_error">Błąd</string>
   <string name="c_result_copied">Wynik został skopiowany do schowka!</string>
   <string name="c_settings">Ustawienia</string>
   <string name="c_help">Pomoc</string>
   <string name="c_vars_and_constants">Zmienne i stałe</string>
-  <string name="c_prefs_main_category">Główne ustawienia</string>
   <string name="c_prefs_calculations_category">Ustawienia obliczeń</string>
   <string name="c_prefs_appearance_category">Ustawienia wyglądu</string>
   <string name="c_prefs_other_category">Inne ustawienia</string>
-  <string name="c_prefs_drag_button_category">Ustawienia przeciągania przycisków</string>
-  <string name="c_down">Dół</string>
-  <string name="c_up">Góra</string>
-  <string name="c_restart">Restart</string>
   <string name="c_undo">cofnij</string>
   <string name="c_redo">ponów</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">wklej</string>
   <string name="c_vars">zmienne</string>
   <string name="c_copy">Kopiuj</string>
   <string name="c_plot">Stwórz wykres</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Maksymalny czas obliczeń</string>
   <string name="p_calc_max_calculation_time_summary">Jeśli obliczenia przekroczą określony limit, kalkulator zatrzyma się i zgłosi błąd</string>
   <string name="c_exit">Wyjście</string>
-  <string name="c_add">Dodaj</string>
   <string name="c_cancel">Anuluj</string>
   <string name="c_save">Zapisz</string>
   <string name="c_remove">Usuń</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Nazwa zmiennej pokrywa się z nazwą funkcji!</string>
   <string name="c_var_already_exists">Zmienna o tej samej nazwie już istnieje!</string>
   <string name="c_name_is_not_valid">Nazwa stałej jest nieprawidłowa: nazwa musi zaczynać się od litery, może zawierać litery, cyfry lub znak podkreślenia.</string>
-  <string name="c_sys_var_cannot_be_changed">Zmienne systemowe nie mogą być zmienione!</string>
   <string name="c_calc_editor_hint">Wprowadź wyrażenie</string>
-  <string name="c_press_to_copy">Naciśnij, aby skopiować</string>
-  <string name="c_continue">Kontynuuj</string>
   <string name="c_history">Historia</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Historia jest pusta!</string>
-  <string name="c_app_history">Historia</string>
   <string name="c_char_is_not_accepted">Znak \'%s\' nie może być użyty w nazwie zmiennej!</string>
   <string name="c_calc_angle_units">Jednostka wielkości kąta</string>
   <string name="p_deg">Stopnie</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Ósemkowy</string>
   <string name="p_bin">Binarny</string>
   <string name="c_calc_theme">Motyw</string>
-  <string name="p_default_theme">Szary</string>
-  <string name="p_violet_theme">Fioletowy</string>
-  <string name="p_light_blue_theme">Jasnoniebieski</string>
   <string name="p_metro_blue_theme">Niebieski Metro</string>
   <string name="p_metro_green_theme">Zielony Metro</string>
   <string name="p_metro_purple_theme">Fioletowy Metro</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Dokładność wyświetlanego wyniku (wszystkie obliczenia są wykonywane przy maksymalnej dokładności, niezależnie od tej opcji)</string>
   <string name="c_calc_color_display_summary">Włącza cieniowanie i wyróżnianie w polu edytora (np. nazw funkcji, argumentów)</string>
   <string name="c_calc_theme_summary">Ustawia wygląd kalkulatora</string>
-  <string name="c_clear_history">Wyczyść historię</string>
   <string name="c_toggle_datetime">Pokaż/ukryj datę</string>
-  <string name="c_simplify_instead_of_numeric">Następująca zmienna jest niezdefiniowana: {0}!</string>
   <string name="p_grouping_separator_no">Bez grupowania</string>
   <string name="p_grouping_separator_apostrophe">Apostrof (\')</string>
   <string name="p_grouping_separator_space">Spacja ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Znak mnożenia</string>
   <string name="c_calc_multiplication_sign_summary">Ustawia znak mnożenia</string>
   <string name="c_calc_layout">Układ graficzny</string>
-  <string name="p_layout_cellphone">Naukowy (telefon)</string>
   <string name="p_layout_calculator">Naukowy</string>
   <string name="p_layout_calculator_mobile">Naukowy (Duże przyciski)</string>
   <string name="p_layout_simple">Prosty</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Ustawia wygląd przycisków</string>
   <string name="c_calc_haptic_feedback_title">Wibracja przy naciśnięciu</string>
   <string name="c_calc_haptic_feedback_summary">Włącza wibrację po naciśnięciu przycisku</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Krótki</string>
   <string name="p_calc_haptic_feedback_strength_middle">Średni</string>
   <string name="p_calc_haptic_feedback_strength_long">Długi</string>
-  <string name="p_calc_haptic_feedback_duration_title">Czas trwania wibracji</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Czas trwania wibracji</string>
   <string name="empty_var_error">Nie można stworzyć pustej stałej!</string>
   <string name="not_valid_result">Obecny wynik jest nieprawidłowy!</string>
   <string name="c_plot_graph">Wykres</string>
   <string name="c_min_x_value">Od</string>
   <string name="c_max_x_value">Do</string>
-  <string name="c_swipe_distance">Odległość przeciągnięcia</string>
-  <string name="c_swipe_distance_summary">Ustawia odległość na jaką trzeba przeciągnąć po ekranie, aby użyć dodatkowych funkcji widocznych na przyciskach</string>
-  <string name="c_comment">Komentarz</string>
-  <string name="c_history_item_saved">Zapisano</string>
-  <string name="c_history_item_not_saved">Nie zapisano</string>
   <string name="c_expression_copied">Wyrażenie zostało skopiowane do schowka!</string>
-  <string name="c_history_item_status">Stan:</string>
-  <string name="c_history_item_comment">Komentarz:</string>
   <string name="c_use">Użyj</string>
   <string name="c_use_short">Użyj</string>
   <string name="c_copy_expression">Skopiuj wyrażenie</string>
   <string name="c_copy_result">Skopiuj wynik</string>
   <string name="c_history_expression">Wartość</string>
-  <string name="c_history_item_already_saved">Zapisane (zobacz zakładkę \"Zapisana historia\")</string>
   <string name="c_history_comment">Komentarz</string>
   <string name="c_save_history">Zapisz historię</string>
   <string name="c_edit_history">Modyfikuj historię</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Skopiuj opis</string>
   <string name="c_copy_value">Skopiuj wartość</string>
   <string name="c_first_start_text">Dziękujemy za wybranie Calculator++!\n\nCalculator++ jest potężnym narzędziem służącym do wykonywania codziennych obliczeń.</string>
-  <string name="c_first_start_text_title">Witaj</string>
   <string name="c_calc_show_release_notes_title">Pokaż informacje o wydaniu</string>
   <string name="c_calc_show_release_notes_summary">Określa, czy okno z informacjami o wydaniu ma pojawić się po aktualizacji programu</string>
   <string name="c_calc_use_back_button_as_prev_summary">Określa zachowanie przycisku Wstecz</string>
@@ -152,20 +124,11 @@
   <string name="c_calc_ad_free_title">Wspomóż projekt</string>
   <string name="c_calc_ad_free_summary">I usuń reklamy</string>
   <string name="c_calc_already_purchased">Opcja bez reklam została już zakupiona!</string>
-  <string name="c_calc_purchasing">Kupowanie&#8230;</string>
-  <string name="c_calc_clearing">Rozliczanie&#8230;</string>
-  <string name="c_feedback_title">Opinia</string>
   <string name="c_feedback_text">Używasz już aplikacji Calculator++ przez dłuższy czas\n
 i ważna jest dla nas Twoja opinia na jej temat.\n\n
 Proszę, oceń Calculator++ \nna<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
  Google Play</a>,\n napisz komentarz lub \npodyskutuj o aplikacji \nna
 <a href="http://facebook.com/calculatorpp">Facebooku</a></string>
-  <string name="c_notespp_announce_text">Good news - I just released new application for Android called
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-		If you\'re interesting in fast and easy way of making notes please follow the
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
-		and try Notes++!
-	</string>
   <string name="c_angle_units_changed_to">Jednostka wielkości kąta zmieniona na \'%s\'!</string>
   <string name="c_numeral_base_changed_to">System liczbowy zmieniony na \'%s\'!</string>
   <string name="c_conversion_tool">Konwersja</string>
@@ -178,17 +141,7 @@ Proszę, oceń Calculator++ \nna<a href="https://market.android.com/details?id=o
   <string name="other">Inne</string>
   <string name="derivatives">Pochodne/Całki</string>
   <string name="crashed">Calculator++ zawiesił się&#8230;</string>
-  <string name="crash_dialog_title">Calculator++ raport błędu</string>
-  <string name="crash_dialog_text">Niestety, Calculator++ napotkał błąd.\n\n
-W celu naprawienia problemu, potrzebujemy informacji o nim. Jest wysoce zalecane, aby wysłać raport błędu poprzez e-mail (po naciśnięciu przycisku \'OK\', zobaczysz wszystkie wysłane dane w nowym oknie).\n\n
-Czy chcesz wysłać raport o błędzie?</string>
   <string name="prefs_graph_screen_title">Ustawienia wykresu</string>
-  <string name="prefs_graph_interpolate_function">Interpolacja wykresu funkcji</string>
-  <string name="prefs_graph_interpolate_function_summary">Do wykreślenia funkcji zostanie użyta interpolacja sześcienna</string>
-  <string name="prefs_graph_real_color_title">Kolor wykresu części rzeczywistej funkcji</string>
-  <string name="prefs_graph_real_color_summary">Ustawia kolor wykresu części rzeczywistej funkcji</string>
-  <string name="prefs_graph_imag_color_title">Kolor wykresu części urojonej funkcji</string>
-  <string name="prefs_graph_imag_color_summary">Ustawia kolor wykresu części urojonej funkcji</string>
   <string name="p_white_line_color">Biały</string>
   <string name="p_grey_line_color">Szary</string>
   <string name="p_red_line_color">Czerwony</string>
@@ -208,7 +161,6 @@ Czy chcesz wysłać raport o błędzie?</string>
   <string name="empty_function_error">Nie można utworzyć pustej funkcji!</string>
   <string name="do_not_show_messages_in_session">Nie pokazuj tej wiadomości do czasu następnej sesji</string>
   <string name="calculation_messages_dialog_title">Calculator++ ostrzeżenie</string>
-  <string name="arithmetic_error_while_plot">Wystąpił błąd obliczeniowy podczas wykreślania: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Pokaż wiadomości o obliczeniach w oknie</string>
   <string name="p_show_calculation_messages_dialog_summary">Jeżeli pojawi się wiadomość podczas obliczeń, to zostanie ona wyświetlona w specjalnym oknie</string>
@@ -230,7 +182,6 @@ Czy chcesz wysłać raport o błędzie?</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_onscreen_remove_icon_message">Możesz usunąć drugą ikonę z listy aplikacji w ustawieniach lub naciskając następujący przycisk</string>
   <string name="cpp_this_change_may_require_reboot">Ta zmiana może wymagać ponownego uruchomienia</string>
   <string name="cpp_plot_2d">Wykres 2D</string>
   <string name="cpp_plot_3d">Wykres 3D</string>
@@ -271,8 +222,11 @@ Czy chcesz wysłać raport o błędzie?</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_purchase_thank_you_text">Dziękujemy za wsparcie tej aplikacji!\n\n Kilka minut może minąć zanim aplikacja otrzyma informację o zakupie. Możesz zawsze sprawdzić tę informację na Twoim koncie Google.\n
-Jeżeli masz problemy lub pytania, skontaktuj się bezpośrednio ze mną (kontakty są dostępne w Menu-&gt;O aplikacji)</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">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-pt-rbr/text_strings.xml b/android-app/src/main/res/values-pt-rbr/text_strings.xml
index 0ccb225c..c5cfd5dd 100644
--- a/android-app/src/main/res/values-pt-rbr/text_strings.xml
+++ b/android-app/src/main/res/values-pt-rbr/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (Modo Janela)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Configurações</string>
-  <string name="c_syntax_error">Erro</string>
   <string name="c_result_copied">Resultado foi copiado para a área de transferência!</string>
   <string name="c_settings">Configurações</string>
   <string name="c_help">Ajuda</string>
   <string name="c_vars_and_constants">Variáveis e constantes</string>
-  <string name="c_prefs_main_category">Configurações principais</string>
   <string name="c_prefs_calculations_category">Configurações de cálculo</string>
   <string name="c_prefs_appearance_category">Configurações de aparência</string>
   <string name="c_prefs_other_category">Outras configurações</string>
-  <string name="c_prefs_drag_button_category">Configurações do botão arrastar</string>
-  <string name="c_down">Para baixo</string>
-  <string name="c_up">Acima</string>
-  <string name="c_restart">Reiniciar</string>
   <string name="c_undo">desfazer</string>
   <string name="c_redo">refazer</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">colar</string>
   <string name="c_vars">vars</string>
   <string name="c_copy">Copiar</string>
   <string name="c_plot">Desenhar o gráfico</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Tempo máximo de cálculo</string>
   <string name="p_calc_max_calculation_time_summary">Se os cálculos excederem o limite especificado - calculadora interrompe com erro</string>
   <string name="c_exit">Sair</string>
-  <string name="c_add">Adicionar</string>
   <string name="c_cancel">Cancelar</string>
   <string name="c_save">Salvar</string>
   <string name="c_remove">Remover</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Conflito: existe uma função com mesmo nome da variável!</string>
   <string name="c_var_already_exists">Já existe uma variável com mesmo nome!</string>
   <string name="c_name_is_not_valid">O nome da constante não é válido: o nome deve iniciar com uma letra, pode conter letras, dígitos e sublinhado.  </string>
-  <string name="c_sys_var_cannot_be_changed">Uma variável de sistema não pode ser alterada!</string>
   <string name="c_calc_editor_hint">Insira nova expressão</string>
-  <string name="c_press_to_copy">Pressione para copiar</string>
-  <string name="c_continue">Continuar</string>
   <string name="c_history">Histórico</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Histórico vazio!</string>
-  <string name="c_app_history">Histórico</string>
   <string name="c_char_is_not_accepted">Caractere \'%s\' não é aceito em nome de variável!</string>
   <string name="c_calc_angle_units">Unidade atual de ângulo</string>
   <string name="p_deg">Graus</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Octal</string>
   <string name="p_bin">Binário</string>
   <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Cinza</string>
-  <string name="p_violet_theme">Violeta</string>
-  <string name="p_light_blue_theme">Azul Claro</string>
-  <string name="p_metro_blue_theme">Metro Blue (Padrão)</string>
+  <string name="p_metro_blue_theme">Metro Blue</string>
   <string name="p_metro_green_theme">Metro Green</string>
   <string name="p_metro_purple_theme">Metro Purple (Roxo)</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Tema leve</string>
   <string name="c_calc_result_precision_summary">Precisão do resultado (todos os cálculos são feitos com precisão máxima, independentemente do valor desta opção)</string>
   <string name="c_calc_color_display_summary">Alterna a coloração e estilo no editor de calculadora</string>
   <string name="c_calc_theme_summary">Define o tema para a calculadora</string>
-  <string name="c_clear_history">Limpar Histórico</string>
   <string name="c_toggle_datetime">Mostrar/Ocultar data</string>
-  <string name="c_simplify_instead_of_numeric">Próximas constantes são indefinidas: {0}!</string>
   <string name="p_grouping_separator_no">Sem separador de agrupamento</string>
   <string name="p_grouping_separator_apostrophe">Apóstrofo (\')</string>
   <string name="p_grouping_separator_space">Espaço ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Sinal de multiplicação</string>
   <string name="c_calc_multiplication_sign_summary">Define o sinal de multiplicação</string>
   <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_cellphone">Científico (celular)</string>
   <string name="p_layout_calculator">Científica</string>
   <string name="p_layout_calculator_mobile">Científica (botões grandes)</string>
   <string name="p_layout_simple">Simples</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Define o layout dos botões</string>
   <string name="c_calc_haptic_feedback_title">Feedback tátil</string>
   <string name="c_calc_haptic_feedback_summary">Ativa e desativa vibração no botão quando clicar</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Desabilitado</string>
   <string name="p_calc_haptic_feedback_strength_short">Curto</string>
   <string name="p_calc_haptic_feedback_strength_middle">Médio</string>
   <string name="p_calc_haptic_feedback_strength_long">Longo</string>
-  <string name="p_calc_haptic_feedback_duration_title">Duração de feedback tátil</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Duração da vibração durante o clique no botão</string>
   <string name="empty_var_error">Não é possível criar uma constante vazia!</string>
   <string name="not_valid_result">O resultado atual não é válido!</string>
   <string name="c_plot_graph">Gráfico</string>
   <string name="c_min_x_value">De</string>
   <string name="c_max_x_value">Para</string>
-  <string name="c_swipe_distance">Distância de \'Swipe\' entre os botões</string>
-  <string name="c_swipe_distance_summary">Configura a distância de \'swipe\' para os botões que suportam ações adicionais de \'swipe\'</string>
-  <string name="c_comment">Comentar</string>
-  <string name="c_history_item_saved">Salvo</string>
-  <string name="c_history_item_not_saved">Não salvo</string>
   <string name="c_expression_copied">Expressão copiada para a área de transferência!</string>
-  <string name="c_history_item_status">Status:</string>
-  <string name="c_history_item_comment">Comentar:</string>
   <string name="c_use">Uso</string>
   <string name="c_use_short">Uso</string>
   <string name="c_copy_expression">Copiar expressão</string>
   <string name="c_copy_result">Copiar resultado</string>
   <string name="c_history_expression">Valor</string>
-  <string name="c_history_item_already_saved">Salvo (veja a aba \'histórico\')</string>
   <string name="c_history_comment">Comentar</string>
   <string name="c_save_history">Salvar histórico</string>
   <string name="c_edit_history">Modificar histórico</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Copiar descrição</string>
   <string name="c_copy_value">Copiar valor</string>
   <string name="c_first_start_text">Obrigado por escolher o aplicativo Calculadora++! \n\nCalculator++ é uma poderosa ferramenta para fazer os cálculos do dia-a-dia.</string>
-  <string name="c_first_start_text_title">Bem-vindo</string>
   <string name="c_calc_show_release_notes_title">Mostrar as notas de lançamento</string>
   <string name="c_calc_show_release_notes_summary">Define se a janela de pop-up \'notas de lançamento\' deve aparecer após as atualizações</string>
   <string name="c_calc_use_back_button_as_prev_summary">Define o comportamento do botão Voltar</string>
@@ -152,15 +124,11 @@
   <string name="c_calc_ad_free_title">Apoiar o projeto</string>
   <string name="c_calc_ad_free_summary">Remover os anúncios</string>
   <string name="c_calc_already_purchased">A opção de remover os anúncios já foi comprada!</string>
-  <string name="c_calc_purchasing">Comprando...</string>
-  <string name="c_calc_clearing">Limpando...</string>
-  <string name="c_feedback_title">Dê sua opinião</string>
   <string name="c_feedback_text">Você já usa o Calculator++ há algum tempo \ne é importante para nós saber sua opinião.\n\nPor favor, avalie o Calculator++ \nno <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a> \n e deixe um comentário ou \ncomente sobre \n o aplicativo no <a href="http://facebook.com/calculatorpp"> Facebook</a>  </string>
-  <string name="c_notespp_announce_text">Boas notícias - acabaram de lançar um novo aplicativo para Android chamado <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> Notes ++</a>. \n se você estiver interessado em uma maneira rápida e fácil de fazer notas, por favor vá em <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> link</a> e teste o Notes++!</string>
   <string name="c_angle_units_changed_to">Unidades de ângulo foram alteradas para \'%s\'!</string>
   <string name="c_numeral_base_changed_to">A base numérica foi alterada para \'%s\'!</string>
   <string name="c_conversion_tool">Ferramenta de conversão</string>
-  <string name="c_convert">Converter para...</string>
+  <string name="c_convert">Converter para&#8230;</string>
   <string name="convert_to_hex">Converter para hexadecimal</string>
   <string name="convert_to_bin">Converter para binário</string>
   <string name="convert_to_dec">Converter para decimal</string>
@@ -168,16 +136,8 @@
   <string name="result">Resultado</string>
   <string name="other">Outros</string>
   <string name="derivatives">Derivadas/Integrais</string>
-  <string name="crashed">Calculator++ travou...</string>
-  <string name="crash_dialog_title">Relatório de erros de Calculator++</string>
-  <string name="crash_dialog_text">Infelizmente, Calculator++ travou.\n\n Para corrigir o problema precisamos de algumas informações sobre ele. É altamente recomendado enviar um relatório de erros via e-mail (após pressionar o botão \'Ok\' você verá todos os dados enviados em uma nova janela).\n\n Você quer enviar um relatório de erros?</string>
+  <string name="crashed">Calculator++ travou&#8230;</string>
   <string name="prefs_graph_screen_title">Configurações de gráfico</string>
-  <string name="prefs_graph_interpolate_function">Interpolar o gráfico da função</string>
-  <string name="prefs_graph_interpolate_function_summary">Se selecionado, a interpolação cúbica será usada no desenho do gráfico da função</string>
-  <string name="prefs_graph_real_color_title">Cor da parte real do gráfico de funções</string>
-  <string name="prefs_graph_real_color_summary">Definir a cor da parte real do gráfico de funções</string>
-  <string name="prefs_graph_imag_color_title">Cor da parte imaginária do gráfico de funções</string>
-  <string name="prefs_graph_imag_color_summary">Definir a cor do gráfico de funções parte imaginária</string>
   <string name="p_white_line_color">Branco</string>
   <string name="p_grey_line_color">Cinza</string>
   <string name="p_red_line_color">Vermelho</string>
@@ -197,7 +157,6 @@
   <string name="empty_function_error">Não é possível criar uma função vazia!</string>
   <string name="do_not_show_messages_in_session">Não mostre esta mensagem até a próxima sessão</string>
   <string name="calculation_messages_dialog_title">Aviso</string>
-  <string name="arithmetic_error_while_plot">Um erro aritmético ocorreu durante a plotagem: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Mostrar mensagens de cálculo na caixa de diálogo</string>
   <string name="p_show_calculation_messages_dialog_summary">Se ativada, qualquer mensagem que ocorrer durante cálculos especiais será exibida numa caixa de diálogo</string>
@@ -219,7 +178,6 @@
   <string name="prefs_onscreen_start_on_boot_summary">Se ligado, a calculadora aparecerá na barra de notificação após a inicialização do dispositivo</string>
   <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
   <string name="prefs_onscreen_show_app_icon_summary">Se ligado, um segundo ícone será mostrado na lista de aplicações</string>
-  <string name="cpp_onscreen_remove_icon_message">Você pode remover o segundo ícone na lista de aplicativos através das configurações do aplicativo ou pressionando o botão Avançar</string>
   <string name="cpp_this_change_may_require_reboot">Essa mudança pode exigir reinicialização</string>
   <string name="cpp_plot_2d">Plotagem 2D</string>
   <string name="cpp_plot_3d">Plotagem 3D</string>
@@ -260,7 +218,11 @@
   <string name="cpp_continue">Continuar</string>
   <string name="cpp_purchase_text">Apoiar o projeto é fácil e seguro: o processo de compra é fornecido pelo Google e tudo que você precisa é ums conta do Google corretamente configurada.\n\n As informações sobre pagamento são armazenadas nos servidores do Google com sua conta do Google e você pode facilmente usar esta aplicação em vários dispositivos.\n\n, Clicando o botão \'Continuar\', você será redirecionado para o aplicativo Google para fazer o pagamento.</string>
   <string name="cpp_purchase_title">Comprar</string>
-  <string name="cpp_purchase_thank_you_text">Obrigado por ajudar esta aplicação! \n\n Pode demorar vários minutos até que o app será informado sobre a compra. Você pode sempre verificar as informações sobre a compra em sua conta do Google. \n Se você tiver qualquer problema ou dúvida não hesite em entrar em contato comigo diretamente (os meus contatos estão disponíveis no Menu-&gt;Principal--&gt;Sobre)  </string>
   <string name="cpp_var_show_greek_keyboard">Mostrar letras gregas</string>
   <string name="cpp_var_hide_greek_keyboard">Mostrar letras gregas</string>
+  <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>
+  <string name="cpp_new_in_version">Novo na versão %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Você deseja testar novos temas? Escolha-os pela lista:</string>
 </resources>
diff --git a/android-app/src/main/res/values-pt-rpt/text_strings.xml b/android-app/src/main/res/values-pt-rpt/text_strings.xml
index 46ea9ce7..cfd7a1c3 100644
--- a/android-app/src/main/res/values-pt-rpt/text_strings.xml
+++ b/android-app/src/main/res/values-pt-rpt/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++ (Modo de Janela)</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">Configurações</string>
-  <string name="c_syntax_error">Erro</string>
   <string name="c_result_copied">O resultado foi copiado para a área de transferência!</string>
   <string name="c_settings">Configurações</string>
   <string name="c_help">Ajuda</string>
   <string name="c_vars_and_constants">Variáveis e Constantes</string>
-  <string name="c_prefs_main_category">Definições principais</string>
   <string name="c_prefs_calculations_category">Definições de cálculo</string>
   <string name="c_prefs_appearance_category">Definições de aparência</string>
   <string name="c_prefs_other_category">Outras definições</string>
-  <string name="c_prefs_drag_button_category">Definições de arraste de botões</string>
-  <string name="c_down">Baixo</string>
-  <string name="c_up">Cima</string>
-  <string name="c_restart">Recomeçar</string>
   <string name="c_undo">desfazer</string>
   <string name="c_redo">refazer</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">colar</string>
   <string name="c_vars">variáveis</string>
   <string name="c_copy">Copiar</string>
   <string name="c_plot">Desenhar gráfico</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Máximo tempo de cálculo</string>
   <string name="p_calc_max_calculation_time_summary">Se o cálculo exceder o limite especificado - a calculadora para com erro</string>
   <string name="c_exit">Sair</string>
-  <string name="c_add">Somar</string>
   <string name="c_cancel">Cancelar</string>
   <string name="c_save">Guardar</string>
   <string name="c_remove">Remover</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Nome da variável colide com o nome da função!</string>
   <string name="c_var_already_exists">Já existe uma variável com o mesmo nome!</string>
   <string name="c_name_is_not_valid">O nome da constante não é válido: o nome deve começar por uma letra, pode conter letras, dígitos e underscore.</string>
-  <string name="c_sys_var_cannot_be_changed">O sistema de variáveis não pode ser modificado!</string>
   <string name="c_calc_editor_hint">Introduza uma nova expressão</string>
-  <string name="c_press_to_copy">Pressione para copiar</string>
-  <string name="c_continue">Continuar</string>
   <string name="c_history">Histórico</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">O histórico está vazio!</string>
-  <string name="c_app_history">Histórico</string>
   <string name="c_char_is_not_accepted">O caracter \'%s\' não é aceite como nome de variável!</string>
   <string name="c_calc_angle_units">Unidades do ângulo actual</string>
   <string name="p_deg">Graus</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Octal</string>
   <string name="p_bin">Binário</string>
   <string name="c_calc_theme">Tema</string>
-  <string name="p_default_theme">Cinzento</string>
-  <string name="p_violet_theme">Violeta</string>
-  <string name="p_light_blue_theme">Light Blue</string>
-  <string name="p_metro_blue_theme">Metro Blue (Default)</string>
+  <string name="p_metro_blue_theme">Metro Blue</string>
   <string name="p_metro_green_theme">Metro Green</string>
   <string name="p_metro_purple_theme">Metro Purple</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Precisão do valor do resultado (todos os cálculos são realizados com a precisão máxima independentemente o valor desta opção)</string>
   <string name="c_calc_color_display_summary">Alterna a coloração e estilo do editor da calculadora</string>
   <string name="c_calc_theme_summary">Aplica o tema para a calculadora</string>
-  <string name="c_clear_history">Limpar o hitórico</string>
   <string name="c_toggle_datetime">Mostra/esconde a data</string>
-  <string name="c_simplify_instead_of_numeric">As próximas constantes não estão definidas: {0}!</string>
   <string name="p_grouping_separator_no">Não existe separador de grupo</string>
   <string name="p_grouping_separator_apostrophe">Apóstrofe (\')</string>
   <string name="p_grouping_separator_space">Espaço ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Sinal de multiplicação</string>
   <string name="c_calc_multiplication_sign_summary">Aplica o sinal de multiplicação</string>
   <string name="c_calc_layout">Layout</string>
-  <string name="p_layout_cellphone">Científica (telemóvel)</string>
   <string name="p_layout_calculator">Científica</string>
   <string name="p_layout_calculator_mobile">Científica (botões grandes)</string>
   <string name="p_layout_simple">Simples</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Configura o layout dos botões</string>
   <string name="c_calc_haptic_feedback_title">Feedback háptico</string>
   <string name="c_calc_haptic_feedback_summary">Alterna a vibração ao clicar</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Pequeno</string>
   <string name="p_calc_haptic_feedback_strength_middle">Meio</string>
   <string name="p_calc_haptic_feedback_strength_long">Longo</string>
-  <string name="p_calc_haptic_feedback_duration_title">Duração do feedback háptico</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Duração da vibração no click</string>
   <string name="empty_var_error">Incapaz de criar constante vazia!</string>
   <string name="not_valid_result">O resultado actual não é válido!</string>
   <string name="c_plot_graph">Gráfico</string>
   <string name="c_min_x_value">De</string>
   <string name="c_max_x_value">Para</string>
-  <string name="c_swipe_distance">Arrasta distância para os botões</string>
-  <string name="c_swipe_distance_summary">Configura distância de swipe para botões que suportam ações de swipe adicionais</string>
-  <string name="c_comment">Comentário</string>
-  <string name="c_history_item_saved">Gravado</string>
-  <string name="c_history_item_not_saved">Não gravado</string>
   <string name="c_expression_copied">Expressão copiada para o clipboard!</string>
-  <string name="c_history_item_status">Estado:</string>
-  <string name="c_history_item_comment">Comentário:</string>
   <string name="c_use">Uso</string>
   <string name="c_use_short">Uso</string>
   <string name="c_copy_expression">Copia expressão</string>
   <string name="c_copy_result">Copia resultado</string>
   <string name="c_history_expression">Valor</string>
-  <string name="c_history_item_already_saved">Gravado (ver a tab \'Hitórico guardado\')</string>
   <string name="c_history_comment">Comentário</string>
   <string name="c_save_history">Guardar histórico</string>
   <string name="c_edit_history">Modificar histórico</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Descrição da cópia</string>
   <string name="c_copy_value">Copia valor</string>
   <string name="c_first_start_text">Obrigado por escolher Calculator++!\n\nCalculator++ é uma ferramenta poderosa para  realizar os cálculos do dia-a-dia.</string>
-  <string name="c_first_start_text_title">Bem-vindo</string>
   <string name="c_calc_show_release_notes_title">Mostra notas de lançamento</string>
   <string name="c_calc_show_release_notes_summary">Define se a pop-up de notas de lançamento deve aparecer após a atualização para a nova versão</string>
   <string name="c_calc_use_back_button_as_prev_summary">Define o comportamento do botão Back</string>
@@ -152,11 +124,7 @@
   <string name="c_calc_ad_free_title">Apoie o projecto</string>
   <string name="c_calc_ad_free_summary">E remove o anúncio</string>
   <string name="c_calc_already_purchased">Opção livre de anúncios já foi comprada!</string>
-  <string name="c_calc_purchasing">Comprando&#8230;</string>
-  <string name="c_calc_clearing">A limpar&#8230;</string>
-  <string name="c_feedback_title">Feedback</string>
   <string name="c_feedback_text">Tem usado o Calculator++ à algum tempo \n e é importante para nós saber sua opinião sobre a applicação.\n\n Por favor classifique o Calculator++ \n no <a href="https://market.android.com/details?id=org.solovyev.android.calculator"> Google Play</a>, \n deixe um comentário ou \ncomente a aplicação \nno <a href="http://facebook.com/calculatorpp"> Facebook</a></string>
-  <string name="c_notespp_announce_text">Boas notícias - acabei de lançar uma nova aplicação para Android chamada <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> Notes++</a>. \n Se estiver interessado numa forma rápida e fácil de criar notas por favor siga o <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> link</a> e experimente o Notes++!</string>
   <string name="c_angle_units_changed_to">Unidades de ângulo foram alteradas para \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Base numérica foi alterada para \'%s\'!</string>
   <string name="c_conversion_tool">Ferramenta de conversão</string>
@@ -169,15 +137,7 @@
   <string name="other">Outro</string>
   <string name="derivatives">Derivadas/Integrais</string>
   <string name="crashed">Calculator++ crashou&#8230;</string>
-  <string name="crash_dialog_title">Relatório de erro Calculator++</string>
-  <string name="crash_dialog_text">Infelizmente, Calculator++ deixou de funcionar.\n\n Para corrigir o problema precisamos de algumas informações. É altamente recomendado enviar um relatório via e-mail (depois de premir o botão \'Ok\' verá todos os dados enviados).\n\n Deseja enviar o relatório?</string>
   <string name="prefs_graph_screen_title">Configurações de gráficos</string>
-  <string name="prefs_graph_interpolate_function">Interpolar o gráfico da função</string>
-  <string name="prefs_graph_interpolate_function_summary">Se selecionado,  interpolação cúbica será usada no desenho do gráfico</string>
-  <string name="prefs_graph_real_color_title">Cor do parte real do gráfico</string>
-  <string name="prefs_graph_real_color_summary">Define a cor da parte real do gráfico</string>
-  <string name="prefs_graph_imag_color_title">Cor da parte imaginária do gráfico</string>
-  <string name="prefs_graph_imag_color_summary">Define a cor da parte imaginária do gráfico</string>
   <string name="p_white_line_color">Branco</string>
   <string name="p_grey_line_color">Cinzento</string>
   <string name="p_red_line_color">Vermelho</string>
@@ -197,7 +157,6 @@
   <string name="empty_function_error">Não é possível criar função vazia!</string>
   <string name="do_not_show_messages_in_session">Não mostrar esta mensagem até à próxima sessão</string>
   <string name="calculation_messages_dialog_title">Aviso Calculator+ +</string>
-  <string name="arithmetic_error_while_plot">Ocorreu um erro aritmético durante a plotagem: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Mostrar mensagens de cálculo em janela de diálogo</string>
   <string name="p_show_calculation_messages_dialog_summary">Se ativada, será exibida uma janela especial de diálogo em qualquer mensagem que ocorra durante cálculos</string>
@@ -219,7 +178,6 @@
   <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_onscreen_remove_icon_message">Pode remover o segundo ícone na lista de aplicações a partir das configurações ou pressionando o botão Avançar</string>
   <string name="cpp_this_change_may_require_reboot">Esta alteração pode necessitar de reinicialização</string>
   <string name="cpp_plot_2d">Gráfico 2D</string>
   <string name="cpp_plot_3d">Gráfico 3D</string>
@@ -230,7 +188,7 @@
   <string name="cpp_color_map_line_color_type">Mapa de cor (3D apenas)</string>
   <string name="cpp_solid_line_style">Sólido (-)</string>
   <string name="cpp_dashed_line_style">Tracejado (- - -)</string>
-  <string name="cpp_dotted_line_style">Pontos (...)</string>
+  <string name="cpp_dotted_line_style">Pontos (. . .)</string>
   <string name="cpp_dash_dotted_line_style">Ponto-traço (-.-.-)</string>
   <string name="cpp_plotter">Funções de plotagem</string>
   <string name="cpp_plot_screenshot">Capturar écran</string>
@@ -260,7 +218,11 @@
   <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_purchase_thank_you_text">Obrigado por apoiar esta aplicação! \n\n Pode demorar vários minutos até que a aplicação seja informada sobre a compra. Poderá  sempre verificar as informações sobre a compra na sua conta Google. \n Se tiver algum problema ou dúvida não hesite em contactar-me (os contatos estão disponíveis em Principal-&gt;Menu-&gt;Sobre)</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>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-ru/text_strings.xml b/android-app/src/main/res/values-ru/text_strings.xml
index fb5e10c2..84a8ebab 100644
--- a/android-app/src/main/res/values-ru/text_strings.xml
+++ b/android-app/src/main/res/values-ru/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Калькулятор++</string>
   <string name="c_app_name_on_screen">Калькулятор++ (В отдельном окне)</string>
-  <string name="c_app_icon_name">Кальк++</string>
   <string name="c_app_settings">Настройки</string>
-  <string name="c_syntax_error">Ошибка</string>
   <string name="c_result_copied">Результат был скопирован в буфер обмена!</string>
   <string name="c_settings">Настройки</string>
   <string name="c_help">Помощь</string>
   <string name="c_vars_and_constants">Переменные и константы</string>
-  <string name="c_prefs_main_category">Основные настройки</string>
   <string name="c_prefs_calculations_category">Настройки вычислений</string>
   <string name="c_prefs_appearance_category">Настройки внешнего вида</string>
   <string name="c_prefs_other_category">Другие настройки</string>
-  <string name="c_prefs_drag_button_category">Настройки кнопок</string>
-  <string name="c_down">Вниз</string>
-  <string name="c_up">Вверх</string>
-  <string name="c_restart">Перезапуск</string>
   <string name="c_undo">назад</string>
   <string name="c_redo">вперёд</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">вставить</string>
   <string name="c_vars">переменные</string>
   <string name="c_copy">Копировать</string>
   <string name="c_plot">Построить график</string>
@@ -40,7 +32,6 @@
 		остановится с ошибкой
 	</string>
   <string name="c_exit">Выход</string>
-  <string name="c_add">Добавить</string>
   <string name="c_cancel">Отмена</string>
   <string name="c_save">Сохранить</string>
   <string name="c_remove">Удалить</string>
@@ -61,14 +52,9 @@
   <string name="c_name_is_not_valid">Имя переменной не валидно: имя должно начинаться с буквы, может содержать буквы,
 		цифры и знак подчёркивания.
 	</string>
-  <string name="c_sys_var_cannot_be_changed">Системная переменная не может быть изменена!</string>
   <string name="c_calc_editor_hint">Введите новое выражение</string>
-  <string name="c_press_to_copy">Нажмите для копирования</string>
-  <string name="c_continue">Продолжить</string>
   <string name="c_history">История</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">История пуста!</string>
-  <string name="c_app_history">История</string>
   <string name="c_char_is_not_accepted">Символ \'%s\' не допустим в названии переменной!</string>
   <string name="c_calc_angle_units">Текущие единицы измерения углов</string>
   <string name="p_deg">Градусы</string>
@@ -86,23 +72,18 @@
   <string name="p_oct">Восьмеричная</string>
   <string name="p_bin">Бинарная</string>
   <string name="c_calc_theme">Тема оформления</string>
-  <string name="p_default_theme">Серая</string>
-  <string name="p_violet_theme">Фиолетовая</string>
-  <string name="p_light_blue_theme">Голубая</string>
   <string name="p_metro_blue_theme">Метро Синяя</string>
   <string name="p_metro_green_theme">Метро Зелёная</string>
   <string name="p_metro_purple_theme">Метро Фиолетовая</string>
-	<string name="p_material_theme">Матириал</string>
-	<string name="p_material_light_theme">Матириал Светлая</string>
+  <string name="p_material_theme">Матириал</string>
+  <string name="p_material_light_theme">Матириал Светлая</string>
   <string name="c_calc_result_precision_summary">Точность результата(все вычисления производятся максимально точно)
 	</string>
   <string name="c_calc_color_display_summary">Включает/выключает подсветку синтаксиса в поле редактирования
 		калькулятора
 	</string>
   <string name="c_calc_theme_summary">Устанавливает тему оформления приложения</string>
-  <string name="c_clear_history">Очистить историю</string>
   <string name="c_toggle_datetime">Показать/скрыть даты</string>
-  <string name="c_simplify_instead_of_numeric">Следующие константы не определены: {0}!</string>
   <string name="p_grouping_separator_no">Не использовать разделитель разрядов</string>
   <string name="p_grouping_separator_apostrophe">Апостроф (\')</string>
   <string name="p_grouping_separator_space">Пробел ( )</string>
@@ -111,7 +92,6 @@
   <string name="c_calc_multiplication_sign">Знак произведения</string>
   <string name="c_calc_multiplication_sign_summary">Устанавливает знак произведения</string>
   <string name="c_calc_layout">Раскладка</string>
-  <string name="p_layout_cellphone">Научная (телефон)</string>
   <string name="p_layout_calculator">Научная</string>
   <string name="p_layout_calculator_mobile">Научная (большие кнопки)</string>
   <string name="p_layout_simple">Простая</string>
@@ -119,33 +99,21 @@
   <string name="c_calc_layout_summary">Устанавливает раскладку кнопок</string>
   <string name="c_calc_haptic_feedback_title">Отклик на нажатие</string>
   <string name="c_calc_haptic_feedback_summary">Включает/выключает вибрацию по нажатию клавиши</string>
-  <string name="p_calc_haptic_feedback_strength_disabled">Выключена</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Выключен</string>
   <string name="p_calc_haptic_feedback_strength_short">Маленькая</string>
   <string name="p_calc_haptic_feedback_strength_middle">Средняя</string>
   <string name="p_calc_haptic_feedback_strength_long">Большая</string>
-  <string name="p_calc_haptic_feedback_duration_title">Длительность отклика</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Длительность вибрации по нажатию клавиши</string>
   <string name="empty_var_error">Невозможно создать пустую константу!</string>
   <string name="not_valid_result">Результат не допустим!</string>
   <string name="c_plot_graph">График</string>
   <string name="c_min_x_value">От</string>
   <string name="c_max_x_value">До</string>
-  <string name="c_swipe_distance">Длина свайпа для клавиш</string>
-  <string name="c_swipe_distance_summary">Устанавливает длину свайпа для клавиш которые поддерживают дополнительные
-		действия по свайпу
-	</string>
-  <string name="c_comment">Комментарий</string>
-  <string name="c_history_item_saved">Сохранено</string>
-  <string name="c_history_item_not_saved">Не сохранено</string>
   <string name="c_expression_copied">Выражение скопировано в буфер!</string>
-  <string name="c_history_item_status">Статус:</string>
-  <string name="c_history_item_comment">Комментарий:</string>
   <string name="c_use">Использовать</string>
   <string name="c_use_short">Исп.</string>
   <string name="c_copy_expression">Копировать выражение</string>
   <string name="c_copy_result">Копировать результат</string>
   <string name="c_history_expression">Значение</string>
-  <string name="c_history_item_already_saved">Сохранено (см. вкладку \'Сохранённая история\')</string>
   <string name="c_history_comment">Комментарий</string>
   <string name="c_save_history">Сохранить</string>
   <string name="c_edit_history">Изменить</string>
@@ -158,7 +126,6 @@
   <string name="c_copy_description">Копировать описание</string>
   <string name="c_copy_value">Копировать значение</string>
   <string name="c_first_start_text">Спасибо за выбор Калькулятора++!\n\nКалькулятор++ - это мощный инструмент для проведения ежедневных расчётов.</string>
-  <string name="c_first_start_text_title">Приветствие</string>
   <string name="c_calc_show_release_notes_title">Показывать примечания к выпуску</string>
   <string name="c_calc_show_release_notes_summary">Определяет показывать или нет всплывающее окно с примечаниями к
 		выпуску после обновления новой версии
@@ -175,9 +142,6 @@
   <string name="c_calc_ad_free_title">Поддержать проект</string>
   <string name="c_calc_ad_free_summary">И убрать рекламу</string>
   <string name="c_calc_already_purchased">Опция уже была куплена!</string>
-  <string name="c_calc_purchasing">Покупаем&#8230;</string>
-  <string name="c_calc_clearing">Очищаем&#8230;</string>
-  <string name="c_feedback_title">Отзыв</string>
   <string name="c_feedback_text">Вы используете Калькулятор++ некоторое время\n
 		и для нас важно узнать ваше мнение о приложении.\n\n
 		Пожалуйста, оцените Калькулятор++ \nна
@@ -185,12 +149,6 @@
 		комментарий или \nобсудите приложение \nв
 		<a href="http://facebook.com/calculatorpp">Facebook</a>
 	</string>
-  <string name="c_notespp_announce_text">Хорошие новости - я только что выпустил новое приложение под Андроид под
-		названием<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Заметки++</a>.\n
-		Если вы заинтересованы в быстром и удобном способе оставлять заметки пройдите по
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">ссылке</a>
-		и попробуйте Заметки++!
-	</string>
   <string name="c_angle_units_changed_to">Единицы измерения углов изменены на \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Система счисления изменена на \'%s\'!</string>
   <string name="c_conversion_tool">Перевод величин</string>
@@ -203,22 +161,7 @@
   <string name="other">Другие</string>
   <string name="derivatives">Производные/Интегралы</string>
   <string name="crashed">Калькулятор++ обнаружил ошибку&#8230;</string>
-  <string name="crash_dialog_title">Отчёт об ошибке в Калькуляторе++</string>
-  <string name="crash_dialog_text">
-		К сожалению, Калькулятор++ завершился с ошибкой.\n\n
-		Для того чтобы исправить её, нам необходима некоторая дополнительная информация. Мы рекомендуем вам выслать этот
-		отчёт об ошибке (после нажатия кнопки \'Да\' вы увидите всю передаваемую информацию в новом окне).\n\n
-		Хотите ли вы выслать отчёт об ошибке?
-	</string>
   <string name="prefs_graph_screen_title">Настройки графиков</string>
-  <string name="prefs_graph_interpolate_function">Интерполировать график</string>
-  <string name="prefs_graph_interpolate_function_summary">Если включено - при построении графика будет использована
-		интерполяция
-	</string>
-  <string name="prefs_graph_real_color_title">Цвет вещественной части графика</string>
-  <string name="prefs_graph_real_color_summary">Устанавливает цвет вещественной части графика</string>
-  <string name="prefs_graph_imag_color_title">Цвет мнимой части графика</string>
-  <string name="prefs_graph_imag_color_summary">Устанавливает цвет мнимой части графика</string>
   <string name="p_white_line_color">Белый</string>
   <string name="p_grey_line_color">Серый</string>
   <string name="p_red_line_color">Красный</string>
@@ -240,7 +183,6 @@
   <string name="empty_function_error">Невозможно создать пустую функцию!</string>
   <string name="do_not_show_messages_in_session">Не показывать это сообщение до следующего запуска программы</string>
   <string name="calculation_messages_dialog_title">Калькулятор++</string>
-  <string name="arithmetic_error_while_plot">При построении графика возникла арифметическая ошибка: %s</string>
   <string name="ok">Да</string>
   <string name="p_show_calculation_messages_dialog_title">Показывать сообщения об ошибках в диалоге</string>
   <string name="p_show_calculation_messages_dialog_summary">Если включено, то сообщения об ошибках возникающих при
@@ -273,9 +215,6 @@
   <string name="prefs_onscreen_show_app_icon_summary">Если включено, то вторая иконка будет добавлена в список
 		приложений
 	</string>
-  <string name="cpp_onscreen_remove_icon_message">Вы можете удалить вторую иконку Калькулятора++ из списка приложений
-		из настроек или нажав следующую кнопку
-	</string>
   <string name="cpp_this_change_may_require_reboot">Это изменение может потребовать перезагрузки</string>
   <string name="cpp_plot_2d">2D график</string>
   <string name="cpp_plot_3d">3D график</string>
@@ -324,13 +263,11 @@
 		По нажатию кнопки \'Продолжить\' вы будете перенаправлены в приложение Google Play для совершения покупки.
 	</string>
   <string name="cpp_purchase_title">Покупка</string>
-  <string name="cpp_purchase_thank_you_text">Спасибо за помощь в развитии проекта!\n\n Приложение получит уведомление
-		о покупке в течение нескольких минут. Вы всегда можете посмотреть состояние покупки в вашем Google аккаунте.\n
-		Если у вас есть вопросы или проблемы вы всегда можете обратиться ко мне напрямую (конакты доступны в Меню-&gt;О
-		приложении)
-	</string>
   <string name="cpp_var_show_greek_keyboard">Показать греческий алфавит</string>
   <string name="cpp_var_hide_greek_keyboard">Скрыть греческий алфавит</string>
-	<string name="cpp_new_in_version">Новое в версии %1$s</string>
-	<string name="cpp_release_notes_choose_theme">Хотите попробовать новые темы в стиле Матириал? Выберите их из списка:</string>
+  <string name="cpp_clear_history_title">Очистить историю?</string>
+  <string name="cpp_clear_history_message">Вся история будет очищена.</string>
+  <string name="cpp_clear_history">Очистить</string>
+  <string name="cpp_new_in_version">Новое в версии %1$s</string>
+  <string name="cpp_release_notes_choose_theme">Хотите попробовать новые темы в стиле Матириал? Выберите их из списка:</string>
 </resources>
diff --git a/android-app/src/main/res/values-uk/text_strings.xml b/android-app/src/main/res/values-uk/text_strings.xml
index 8ba76c09..4c17ede8 100644
--- a/android-app/src/main/res/values-uk/text_strings.xml
+++ b/android-app/src/main/res/values-uk/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Калькулятор++</string>
   <string name="c_app_name_on_screen">Калькулятор + + (віконний режим)</string>
-  <string name="c_app_icon_name">Кальк++</string>
   <string name="c_app_settings">Налаштування</string>
-  <string name="c_syntax_error">Помилка</string>
   <string name="c_result_copied">Результат був скопійований до буферу обміну!</string>
   <string name="c_settings">Налаштування</string>
   <string name="c_help">Допомога</string>
   <string name="c_vars_and_constants">Змінні та константи</string>
-  <string name="c_prefs_main_category">Основні налаштування</string>
   <string name="c_prefs_calculations_category">Налаштування обчислень</string>
   <string name="c_prefs_appearance_category">Налаштування вигляду</string>
   <string name="c_prefs_other_category">Інші налаштування</string>
-  <string name="c_prefs_drag_button_category">Налаштування кнопок</string>
-  <string name="c_down">Вниз</string>
-  <string name="c_up">Вгору</string>
-  <string name="c_restart">Перезавантаження</string>
   <string name="c_undo">назад</string>
   <string name="c_redo">повторити</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">вставити</string>
   <string name="c_vars">змінні</string>
   <string name="c_copy">Копіювати</string>
   <string name="c_plot">Побудувати графік</string>
@@ -40,7 +32,6 @@
 		калькулятор зупиниться з помилкою
 	</string>
   <string name="c_exit">Вийти</string>
-  <string name="c_add">Додати</string>
   <string name="c_cancel">Скасувати</string>
   <string name="c_save">Зберегти</string>
   <string name="c_remove">Вилучити</string>
@@ -57,14 +48,9 @@
   <string name="c_var_name_clashes">Ім’я змінної не може бути зарезервованим системним ім’ям!</string>
   <string name="c_var_already_exists">Змінна з таким іменем вже існує!</string>
   <string name="c_name_is_not_valid">Неприпустиме ім\'я змінної: ім\'я має починатися з літери, може містити літери, цифри та знак підкреслення(_).</string>
-  <string name="c_sys_var_cannot_be_changed">Системну змінну не можна змінювати!</string>
   <string name="c_calc_editor_hint">Введіть новий вираз</string>
-  <string name="c_press_to_copy">Натисніть для копіювання</string>
-  <string name="c_continue">Продовжити</string>
   <string name="c_history">Історія</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Історія порожня!</string>
-  <string name="c_app_history">Історія</string>
   <string name="c_char_is_not_accepted">Символ \'%s\' не допустимий у імені змінної!</string>
   <string name="c_calc_angle_units">Поточні одиниці виміру кутів</string>
   <string name="p_deg">Градуси</string>
@@ -79,19 +65,16 @@
   <string name="p_oct">Вісімкова</string>
   <string name="p_bin">Двійкова</string>
   <string name="c_calc_theme">Тема</string>
-  <string name="p_default_theme">Сіра</string>
-  <string name="p_violet_theme">Фіолетова</string>
-  <string name="p_light_blue_theme">Блакитна</string>
   <string name="p_metro_blue_theme">Метро Синя</string>
   <string name="p_metro_green_theme">Метро Зелена</string>
   <string name="p_metro_purple_theme">Метро Пурпурова</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Точність відображення результату (усі обчислення проводяться максимально точно, незалежно від цього параметру)
 	</string>
   <string name="c_calc_color_display_summary">Увімкнути/вимкнути підсвітку у редакторі калькулятора</string>
   <string name="c_calc_theme_summary">Встановити тему калькулятора</string>
-  <string name="c_clear_history">Очистити історію</string>
   <string name="c_toggle_datetime">Відображення дати</string>
-  <string name="c_simplify_instead_of_numeric">Наступні константи невизначені: {0}!</string>
   <string name="p_grouping_separator_no">Не використовувати роздільник розрядів</string>
   <string name="p_grouping_separator_apostrophe">Апостроф (\')</string>
   <string name="p_grouping_separator_space">Пробіл ( )</string>
@@ -100,7 +83,6 @@
   <string name="c_calc_multiplication_sign">Знак множення</string>
   <string name="c_calc_multiplication_sign_summary">Задає вигляд знаку множення</string>
   <string name="c_calc_layout">Розкладка</string>
-  <string name="p_layout_cellphone">Наукова (телефон)</string>
   <string name="p_layout_calculator">Наукова</string>
   <string name="p_layout_calculator_mobile">Науковий (великі кнопки)</string>
   <string name="p_layout_simple">Проста</string>
@@ -108,30 +90,21 @@
   <string name="c_calc_layout_summary">Задає розкладку кнопок</string>
   <string name="c_calc_haptic_feedback_title">Вібрація при натисканні</string>
   <string name="c_calc_haptic_feedback_summary">Увімкнути/вимкнути вібрацію при натисканні</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Коротка</string>
   <string name="p_calc_haptic_feedback_strength_middle">Середня</string>
   <string name="p_calc_haptic_feedback_strength_long">Велика</string>
-  <string name="p_calc_haptic_feedback_duration_title">Тривалість вібрації</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Тривалість вібрації при натисканні</string>
   <string name="empty_var_error">Не можна створити порожню константу!</string>
   <string name="not_valid_result">Поточний результат не допустимий!</string>
   <string name="c_plot_graph">Графік</string>
   <string name="c_min_x_value">Від</string>
   <string name="c_max_x_value">До</string>
-  <string name="c_swipe_distance">Відстань розмаху (свайпу) для кнопок</string>
-  <string name="c_swipe_distance_summary">Задає відстань розмаху для кнопок, які підтримують додаткові дії для свайпу</string>
-  <string name="c_comment">Коментар</string>
-  <string name="c_history_item_saved">Збережено</string>
-  <string name="c_history_item_not_saved">Не збережено</string>
   <string name="c_expression_copied">Вираз скопійовано до буфера!</string>
-  <string name="c_history_item_status">Статус:</string>
-  <string name="c_history_item_comment">Коментар:</string>
   <string name="c_use">Використовувати</string>
   <string name="c_use_short">Вик.</string>
   <string name="c_copy_expression">Копіювати вираз</string>
   <string name="c_copy_result">Копіювати результат</string>
   <string name="c_history_expression">Значення</string>
-  <string name="c_history_item_already_saved">Збережено (див. вкладку \'Збережена історія\')</string>
   <string name="c_history_comment">Коментар</string>
   <string name="c_save_history">Зберегти історію</string>
   <string name="c_edit_history">Змінити історію</string>
@@ -145,7 +118,6 @@
   <string name="c_copy_value">Копіювати значення</string>
   <string name="c_first_start_text">Дякуємо вам за вибір Калькулятор++!\n\nКалькулятор++ - це потужний інструмент для
 		проведення щоденних розрахунків.</string>
-  <string name="c_first_start_text_title">Вітаємо</string>
   <string name="c_calc_show_release_notes_title">Показувати замітки до випуску</string>
   <string name="c_calc_show_release_notes_summary">Визначає, чи показувати спливне вікно із замітками до випуску
 		після оновлення до нової версії
@@ -162,9 +134,6 @@
   <string name="c_calc_ad_free_title">Підтримайте проект</string>
   <string name="c_calc_ad_free_summary">і позбудьтеся реклами!</string>
   <string name="c_calc_already_purchased">Опція вже куплена!</string>
-  <string name="c_calc_purchasing">Купуємо&#8230;</string>
-  <string name="c_calc_clearing">Очищаємо&#8230;</string>
-  <string name="c_feedback_title">Зворотній зв’язок</string>
   <string name="c_feedback_text">Ви вже використовуєте Калькулятор++ деякий час \n
 		і для нас важливо знати вашу думку про програму.\n\n
 		Будь ласка, оцініть Калькулятор++ \nна
@@ -172,7 +141,6 @@
 		коментар або \nобговоріть програму \nна
 		<a href="http://facebook.com/calculatorpp">Facebook</a>
 	</string>
-  <string name="c_notespp_announce_text">Гарні новини - я щойно випустив нову програму для Android, яка називається <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>. \n Якщо ви зацікавлені в швидкому і простому способі створення нотатків, будь ласка, перейдіть за <a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">посиланням</a> та спробуйте Notes++!</string>
   <string name="c_angle_units_changed_to">Одиниці виміру кутів змінено на \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Система числення змінена на \'%s\'!</string>
   <string name="c_conversion_tool">Перетворення чисел</string>
@@ -184,16 +152,8 @@
   <string name="result">Результат</string>
   <string name="other">Інші</string>
   <string name="derivatives">Похідні/Інтеграли</string>
-  <string name="crashed">Калькулятор++ аварійно завершив роботу...</string>
-  <string name="crash_dialog_title">Звіт Калькулятор++ про аварійне завершення роботи</string>
-  <string name="crash_dialog_text">На жаль, Калькулятор++ аварійно завершив свою роботу.\n\n Для того, щоб вирішити проблему нам необхідна деяка інформація. Наполегливо рекомендуємо відправити звіт, щодо аварійного завершення, електронною поштою (після натискання кнопки \'Ok\' , ви побачите в новому вікні всі дані, які будуть відправлені).\n\n Ви хочете надіслати звіт?</string>
+  <string name="crashed">Калькулятор++ аварійно завершив роботу&#8230;</string>
   <string name="prefs_graph_screen_title">Налаштування графіків</string>
-  <string name="prefs_graph_interpolate_function">Інтерполювати графік функції</string>
-  <string name="prefs_graph_interpolate_function_summary">Якщо позначено, кубічна інтерполяція буде використовуватися для побудови графіків функції</string>
-  <string name="prefs_graph_real_color_title">Колір дійсної частини графіку функції</string>
-  <string name="prefs_graph_real_color_summary">Встановлює колір дійсної частини графіку функції</string>
-  <string name="prefs_graph_imag_color_title">Колір уявної частини графіку функції</string>
-  <string name="prefs_graph_imag_color_summary">Встановлює колір уявної частини графіку функції</string>
   <string name="p_white_line_color">Білий</string>
   <string name="p_grey_line_color">Сірий</string>
   <string name="p_red_line_color">Червоний</string>
@@ -213,7 +173,6 @@
   <string name="empty_function_error">Не вдалося створити порожню функцію!</string>
   <string name="do_not_show_messages_in_session">Не показувати це повідомлення до наступної сесії</string>
   <string name="calculation_messages_dialog_title">Попередження Калькулятор++</string>
-  <string name="arithmetic_error_while_plot">Арифметична помилка під час відображення: %s</string>
   <string name="ok">OK</string>
   <string name="p_show_calculation_messages_dialog_title">Повідомлення розрахунків у діалозі</string>
   <string name="p_show_calculation_messages_dialog_summary">Якщо увімкнено, то будь-які повідомлення, виниклі під час обчислень, будуть показані у відповідному діалоговому вікні</string>
@@ -235,7 +194,6 @@
   <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_onscreen_remove_icon_message">Ви можете забрати додаткову піктограму із списку програм через налаштування або натиснувши кнопку Далі</string>
   <string name="cpp_this_change_may_require_reboot">Ця зміна може вимагати перезавантаження</string>
   <string name="cpp_plot_2d">2D графік</string>
   <string name="cpp_plot_3d">3D графік</string>
@@ -276,7 +234,11 @@
   <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_purchase_thank_you_text">Дякуємо вам за підтримку цієї програми! \n\n Затримка в декілька хвилин може виникнути, поки програма буде проінформована про покупку. Ви завжди можете перевірити інформацію про покупку в обліковому запису Google. \n Якщо у вас є будь які проблеми або питання, не соромтеся зв\'язатися зі мною безпосередньо (контакти доступні в Головна -&gt; Меню -&gt; Про програму)</string>
   <string name="cpp_var_show_greek_keyboard">Показати грецьких літер</string>
   <string name="cpp_var_hide_greek_keyboard">Приховати грецьких літер</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-vi/text_strings.xml b/android-app/src/main/res/values-vi/text_strings.xml
index 96d80ab8..c9252bd2 100644
--- a/android-app/src/main/res/values-vi/text_strings.xml
+++ b/android-app/src/main/res/values-vi/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Máy tính ++</string>
   <string name="c_app_name_on_screen">Máy tính ++ (chế độ cửa sổ)</string>
-  <string name="c_app_icon_name">Calc ++</string>
   <string name="c_app_settings">Cài đặt</string>
-  <string name="c_syntax_error">Lỗi</string>
   <string name="c_result_copied">Kết quả đã được sao chép vào clipboard!</string>
   <string name="c_settings">Cài đặt</string>
   <string name="c_help">Trợ giúp</string>
   <string name="c_vars_and_constants">Biến và hằng</string>
-  <string name="c_prefs_main_category">Cài đặt chính</string>
   <string name="c_prefs_calculations_category">Cài đặt tính toán</string>
   <string name="c_prefs_appearance_category">Cài đặt giao diện</string>
   <string name="c_prefs_other_category">Các cài đặt khác</string>
-  <string name="c_prefs_drag_button_category">Cài đặt chức năng Kéo nút</string>
-  <string name="c_down">Xuống</string>
-  <string name="c_up">Lên</string>
-  <string name="c_restart">Khởi động lại</string>
   <string name="c_undo">hoàn tác</string>
   <string name="c_redo">làm lại</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">dán</string>
   <string name="c_vars">Các biến</string>
   <string name="c_copy">Copy</string>
   <string name="c_plot">Vẽ đồ thị</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">Thời gian tính toán tối đa</string>
   <string name="p_calc_max_calculation_time_summary">Nếu tính toán vượt quá giới hạn được chỉ định - máy tính treo với lỗi</string>
   <string name="c_exit">Thoát</string>
-  <string name="c_add">Cộng</string>
   <string name="c_cancel">Hủy</string>
   <string name="c_save">Lưu</string>
   <string name="c_remove">Loại bỏ</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">Tên biến xung đột với tên hàm!</string>
   <string name="c_var_already_exists">Biến có cùng tên đã tồn tại!</string>
   <string name="c_name_is_not_valid">Tên của hằng số là không hợp lệ: tên phải bắt đầu với chữ cái, có thể chứa chữ cái, chữ số và gạch dưới.</string>
-  <string name="c_sys_var_cannot_be_changed">Biến hệ thống không được thay đổi!</string>
   <string name="c_calc_editor_hint">Nhập biểu thức mới</string>
-  <string name="c_press_to_copy">Bấm để sao chép</string>
-  <string name="c_continue">Tiếp tục</string>
   <string name="c_history">Nhật ký</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">Lịch sử rỗng!</string>
-  <string name="c_app_history">Lịch sử</string>
   <string name="c_char_is_not_accepted">Ký tự \'%s\' không được chấp nhận trong tên biến!</string>
   <string name="c_calc_angle_units">Đơn vị góc hiện tại</string>
   <string name="p_deg">Độ</string>
@@ -75,18 +61,15 @@
   <string name="p_oct">Hệ bát phân</string>
   <string name="p_bin">Nhị phân</string>
   <string name="c_calc_theme">Chủ đề</string>
-  <string name="p_default_theme">Xám</string>
-  <string name="p_violet_theme">Tím</string>
-  <string name="p_light_blue_theme">Xanh nhạt</string>
   <string name="p_metro_blue_theme">Metro Blue</string>
   <string name="p_metro_green_theme">Metro Green</string>
   <string name="p_metro_purple_theme">Metro Purple</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">Độ chính xác của giá trị kết quả (Tất cả tính toán được thực hiện với độ chính xác tối đa bất kể giá trị của tùy chọn này)</string>
   <string name="c_calc_color_display_summary">Chuyển màu và phong cách trong các bộ biên tập</string>
   <string name="c_calc_theme_summary">Đặt chủ đề cho máy tính</string>
-  <string name="c_clear_history">Xóa lược sử</string>
   <string name="c_toggle_datetime">Hiển thị/ẩn ngày</string>
-  <string name="c_simplify_instead_of_numeric">Hằng số tiếp theo chưa xác định: {0}!</string>
   <string name="p_grouping_separator_no">Không tách nhóm</string>
   <string name="p_grouping_separator_apostrophe">Apostrophe (\')</string>
   <string name="p_grouping_separator_space">Space ( )</string>
@@ -95,7 +78,6 @@
   <string name="c_calc_multiplication_sign">Ký hiệu nhân</string>
   <string name="c_calc_multiplication_sign_summary">Thiết lập Ký hiệu nhân</string>
   <string name="c_calc_layout">Bố cục</string>
-  <string name="p_layout_cellphone">Khoa học (điện thoại di động)</string>
   <string name="p_layout_calculator">Khoa học</string>
   <string name="p_layout_calculator_mobile">Khoa học (nút lớn)</string>
   <string name="p_layout_simple">Đơn giản</string>
@@ -103,30 +85,21 @@
   <string name="c_calc_layout_summary">Bộ bố trí của nút</string>
   <string name="c_calc_haptic_feedback_title">Thông tin phản hồi Haptic</string>
   <string name="c_calc_haptic_feedback_summary">Chuyển rung khi bấm nút</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">Ngắn</string>
   <string name="p_calc_haptic_feedback_strength_middle">Trung bình</string>
   <string name="p_calc_haptic_feedback_strength_long">Dài</string>
-  <string name="p_calc_haptic_feedback_duration_title">Thời gianphản hồi Haptic</string>
-  <string name="p_calc_haptic_feedback_duration_summary">Thời gian rung động khi bấm nút</string>
   <string name="empty_var_error">Không thể tạo hằng số rỗng!</string>
   <string name="not_valid_result">Kết quả hiện tại là không hợp lệ!</string>
   <string name="c_plot_graph">Đồ thị</string>
   <string name="c_min_x_value">Từ</string>
   <string name="c_max_x_value">Đến</string>
-  <string name="c_swipe_distance">Khoảng cách trượt giữa các nút</string>
-  <string name="c_swipe_distance_summary">Thiết lập khoảng cách swipe cho nút có hỗ trợ swipe bổ sung</string>
-  <string name="c_comment">Ghi chú</string>
-  <string name="c_history_item_saved">Đã lưu</string>
-  <string name="c_history_item_not_saved">Chưa lưu</string>
   <string name="c_expression_copied">Biểu thức đã được sao chép vào clipboard!</string>
-  <string name="c_history_item_status">Trạng thái:</string>
-  <string name="c_history_item_comment">Ghi chú:</string>
   <string name="c_use">Sử dụng</string>
   <string name="c_use_short">Sử dụng</string>
   <string name="c_copy_expression">Sao chép biểu thức</string>
   <string name="c_copy_result">Sao chép kết quả</string>
   <string name="c_history_expression">Giá trị</string>
-  <string name="c_history_item_already_saved">Lưu (xem tab \'Lưu lịch sử\')</string>
   <string name="c_history_comment">Ghi chú</string>
   <string name="c_save_history">Lưu lịch sử</string>
   <string name="c_edit_history">Sửa đổi lịch sử</string>
@@ -139,7 +112,6 @@
   <string name="c_copy_description">Sao chép mô tả</string>
   <string name="c_copy_value">Sao chép giá trị</string>
   <string name="c_first_start_text">Cảm ơn bạn đã lựa chọn máy tính ++! \n\nCalculator++ là một công cụ mạnh mẽ cho việc thực hiện các tính toán hàng ngày.</string>
-  <string name="c_first_start_text_title">Chào mừng</string>
   <string name="c_calc_show_release_notes_title">Hiển thị ghi chú phát hành</string>
   <string name="c_calc_show_release_notes_summary">Xác định nếu cửa sổ bật lên ghi chú phát hành sẽ xuất hiện sau khi cập nhật lên phiên bản mới</string>
   <string name="c_calc_use_back_button_as_prev_summary">Xác định các hành vi của nút Back</string>
@@ -152,24 +124,15 @@
   <string name="c_calc_ad_free_title">Hỗ trợ dự án</string>
   <string name="c_calc_ad_free_summary">Và loại bỏ các quảng cáo</string>
   <string name="c_calc_already_purchased">Tùy chọn không có quảng cáo đã được mua!</string>
-  <string name="c_calc_purchasing">Mua...</string>
-  <string name="c_calc_clearing">Xóa&#8230;</string>
-  <string name="c_feedback_title">Thông tin phản hồi</string>
   <string name="c_feedback_text">Bạn đã sử dụng Máy tính ++ một thời gian \n
 và rất quan trọng nếu bạn đóng góp ý kiến cho chúng tôi về ứng dụng.\n\n
 Vui lòng đánh giá cho Máy tính ++ \non<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụng \non
 		<a href="http://facebook.com/calculatorpp">Facebook</a></string>
-  <string name="c_notespp_announce_text">Good news - I have just released a new application for Android called
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n
-		If you\'re interested in a fast and easy way of making notes please follow the
-		<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">link</a>
-		and try Notes++!
-	</string>
   <string name="c_angle_units_changed_to">Đơn vị góc đã được thay đổi sang \'%s\'!</string>
   <string name="c_numeral_base_changed_to">Hệ cơ số đã được thay đổi sang \'%s\'!</string>
   <string name="c_conversion_tool">Công cụ chuyển đổi</string>
-  <string name="c_convert">Chuyển đổi sang...</string>
+  <string name="c_convert">Chuyển đổi sang&#8230;</string>
   <string name="convert_to_hex">Chuyển đổi sang hex</string>
   <string name="convert_to_bin">Chuyển đổi sang bin</string>
   <string name="convert_to_dec">Chuyển đổi sang DEC</string>
@@ -177,18 +140,8 @@ Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụ
   <string name="result">Kết quả</string>
   <string name="other">Khác</string>
   <string name="derivatives">Vi phân/tích phân</string>
-  <string name="crashed">Máy tính ++ crashed...</string>
-  <string name="crash_dialog_title">Máy tính ++ báo cáo lỗi crashed</string>
-  <string name="crash_dialog_text">		Thật không may, Máy tính++ đã crashed.\n\n
-		Để xử lý, chúng tôi cần một vài thông tin. Khuyến cáo gửi báo cáo lỗi qua email (sau khi nhấn nút \'Ok\' bạn sẽ thấy tất cả thông tin được gửi trong cửa sổ mới).\n\n
-		Bạn có muốn gửi thông tin báo cáo lỗi?</string>
+  <string name="crashed">Máy tính ++ crashed&#8230;</string>
   <string name="prefs_graph_screen_title">Cài đặt biểu đồ</string>
-  <string name="prefs_graph_interpolate_function">Chức năng Nội suy của đồ thị</string>
-  <string name="prefs_graph_interpolate_function_summary">Nếu kiểm tra nội suy bậc ba sẽ được sử dụng trong chức năng đồ thị vẽ</string>
-  <string name="prefs_graph_real_color_title">Màu sắc đồ thị của phần thực của hàm</string>
-  <string name="prefs_graph_real_color_summary">Thiết lập Màu sắc đồ thị của phần thực của hàm</string>
-  <string name="prefs_graph_imag_color_title">Màu sắc đồ thị của phần ảo của hàm</string>
-  <string name="prefs_graph_imag_color_summary">Thiết lập Màu sắc đồ thị của phần ảo của hàm</string>
   <string name="p_white_line_color">Trắng</string>
   <string name="p_grey_line_color">Xám</string>
   <string name="p_red_line_color">Đỏ</string>
@@ -208,7 +161,6 @@ Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụ
   <string name="empty_function_error">Không thể tạo ra hàm rỗng!</string>
   <string name="do_not_show_messages_in_session">Không hiện thông báo này cho đến khi phiên tiếp theo</string>
   <string name="calculation_messages_dialog_title">Máy tính ++ cảnh báo</string>
-  <string name="arithmetic_error_while_plot">Lỗi số học xuất hiện khi vẽ: %s</string>
   <string name="ok">Ok</string>
   <string name="p_show_calculation_messages_dialog_title">Hiện các thông báo tính toán trong hộp thoại</string>
   <string name="p_show_calculation_messages_dialog_summary">Nếu bật lên bất kỳ thông báo nào xảy ra trong khi tính toán hộp thoại đặc biệt sẽ được hiển thị</string>
@@ -230,7 +182,6 @@ Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụ
   <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_onscreen_remove_icon_message">Bạn có thể loại bỏ biểu tượng thứ hai trong danh sách ứng dụng từ cài đặt ứng dụng hoặc bằng cách nhấn nút tiếp theo</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_plot_2d">Đồ thị 2D</string>
   <string name="cpp_plot_3d">Đồ thị 3D</string>
@@ -241,7 +192,7 @@ Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụ
   <string name="cpp_color_map_line_color_type">Bản đồ màu (duy nhất 3D)</string>
   <string name="cpp_solid_line_style">Đơn (-----)</string>
   <string name="cpp_dashed_line_style">Nét đưt (- - -)</string>
-  <string name="cpp_dotted_line_style">Chấm (...)</string>
+  <string name="cpp_dotted_line_style">Chấm (. . .)</string>
   <string name="cpp_dash_dotted_line_style">Chấm-gạch (-.-.-)</string>
   <string name="cpp_plotter">Chức năng plotter</string>
   <string name="cpp_plot_screenshot">Chụp ảnh màn hình</string>
@@ -273,8 +224,11 @@ Google Play</a>,\n để lại ý kiến hoặc \n thảo luận về ứng dụ
 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_purchase_thank_you_text">Cảm ơn đã hỗ trợ ứng dụng này!\n\n Sẽ mất vài phút để ứng dụng xác nhận mua hàng. Bạn có thể kiểm tra thông tin mua trong tài khoản Google của bạn.\n
-Nếu có sự cố hay câu hỏi vui lòng liên hệ trực tiếp với tôi (thông tin liên hệ có sẵn trong Main-&gt;Menu-&gt;About)</string>
   <string name="cpp_var_show_greek_keyboard">Hiện các kí tự La Mã</string>
   <string name="cpp_var_hide_greek_keyboard">Ẩn các ký tự La Mã</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-zh-rcn/text_strings.xml b/android-app/src/main/res/values-zh-rcn/text_strings.xml
index 0cf67dfa..0c8080d8 100644
--- a/android-app/src/main/res/values-zh-rcn/text_strings.xml
+++ b/android-app/src/main/res/values-zh-rcn/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++（悬浮）</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">设置</string>
-  <string name="c_syntax_error">错误</string>
   <string name="c_result_copied">结果已复制到剪贴板！</string>
   <string name="c_settings">设置</string>
   <string name="c_help">帮助</string>
   <string name="c_vars_and_constants">变量与常数</string>
-  <string name="c_prefs_main_category">主要设置</string>
   <string name="c_prefs_calculations_category">计算设置</string>
   <string name="c_prefs_appearance_category">外观设置</string>
   <string name="c_prefs_other_category">其他设置</string>
-  <string name="c_prefs_drag_button_category">快捷按键设置</string>
-  <string name="c_down">下</string>
-  <string name="c_up">上</string>
-  <string name="c_restart">重置</string>
   <string name="c_undo">撤销</string>
   <string name="c_redo">重做</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">粘帖</string>
   <string name="c_vars">变量</string>
   <string name="c_copy">复制</string>
   <string name="c_plot">作图</string>
@@ -36,7 +28,6 @@
   <string name="p_calc_max_calculation_time_title">计算时间限制</string>
   <string name="p_calc_max_calculation_time_summary">如果计算超过限制的时间，应用将提示错误并停止计算</string>
   <string name="c_exit">退出</string>
-  <string name="c_add">添加</string>
   <string name="c_cancel">取消</string>
   <string name="c_save">保存</string>
   <string name="c_remove">移除</string>
@@ -53,14 +44,9 @@
   <string name="c_var_name_clashes">变量名称与函数名称冲突!</string>
   <string name="c_var_already_exists">已存在相同名称的变量！</string>
   <string name="c_name_is_not_valid">常数名称不正确：名称必须由英文字母开始，可以包含字母、数字和下划线。</string>
-  <string name="c_sys_var_cannot_be_changed">无法修改系统变量!</string>
   <string name="c_calc_editor_hint">输入运算式</string>
-  <string name="c_press_to_copy">按下复制</string>
-  <string name="c_continue">继续</string>
   <string name="c_history">历史</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">没有历史记录!</string>
-  <string name="c_app_history">历史</string>
   <string name="c_char_is_not_accepted">不能使用字符 \'%s\' 作为变量名称！</string>
   <string name="c_calc_angle_units">当前角度单位</string>
   <string name="p_deg">度</string>
@@ -75,19 +61,16 @@
   <string name="p_oct">八进制</string>
   <string name="p_bin">二进制</string>
   <string name="c_calc_theme">主题</string>
-  <string name="p_default_theme">灰色</string>
-  <string name="p_violet_theme">紫色</string>
-  <string name="p_light_blue_theme">浅蓝色</string>
   <string name="p_metro_blue_theme">Metro蓝</string>
   <string name="p_metro_green_theme">Metro绿</string>
   <string name="p_metro_purple_theme">Metro紫</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
   <string name="c_calc_result_precision_summary">结果显示的精确度（无论此项如何设置，所有的计算都使用最大
 精确度）</string>
   <string name="c_calc_color_display_summary">切换计算器编辑界面的颜色和样式。</string>
   <string name="c_calc_theme_summary">设置应用的主题</string>
-  <string name="c_clear_history">清除历史记录</string>
   <string name="c_toggle_datetime">显示/隐藏日期</string>
-  <string name="c_simplify_instead_of_numeric">函数未定义: {0}!</string>
   <string name="p_grouping_separator_no">无</string>
   <string name="p_grouping_separator_apostrophe">撇号 (\')</string>
   <string name="p_grouping_separator_space">空格 ( )</string>
@@ -96,7 +79,6 @@
   <string name="c_calc_multiplication_sign">乘号</string>
   <string name="c_calc_multiplication_sign_summary">设置乘号</string>
   <string name="c_calc_layout">按鍵布局</string>
-  <string name="p_layout_cellphone">科学型 (手机)</string>
   <string name="p_layout_calculator">科学型</string>
   <string name="p_layout_calculator_mobile">科学型（大按钮）</string>
   <string name="p_layout_simple">简单型</string>
@@ -104,30 +86,21 @@
   <string name="c_calc_layout_summary">设置按键布局</string>
   <string name="c_calc_haptic_feedback_title">触觉反馈</string>
   <string name="c_calc_haptic_feedback_summary">开启/关闭按下按钮时的振动</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">短</string>
   <string name="p_calc_haptic_feedback_strength_middle">中</string>
   <string name="p_calc_haptic_feedback_strength_long">长</string>
-  <string name="p_calc_haptic_feedback_duration_title">触觉反馈持续时间</string>
-  <string name="p_calc_haptic_feedback_duration_summary">按下按钮振动的时间长度</string>
   <string name="empty_var_error">无法创建空的常数！</string>
   <string name="not_valid_result">当前结果无效！</string>
   <string name="c_plot_graph">图表</string>
   <string name="c_min_x_value">从</string>
   <string name="c_max_x_value">到</string>
-  <string name="c_swipe_distance">设置按键滑动距离</string>
-  <string name="c_swipe_distance_summary">设置支持滑动操作的按键的滑动距离</string>
-  <string name="c_comment">备注</string>
-  <string name="c_history_item_saved">已保存</string>
-  <string name="c_history_item_not_saved">未保存</string>
   <string name="c_expression_copied">算式已复制到剪贴板!</string>
-  <string name="c_history_item_status">状态:</string>
-  <string name="c_history_item_comment">备注:</string>
   <string name="c_use">使用</string>
   <string name="c_use_short">使用</string>
   <string name="c_copy_expression">复制算式</string>
   <string name="c_copy_result">复制结果</string>
   <string name="c_history_expression">值</string>
-  <string name="c_history_item_already_saved">已保存 (见 \'历史记录\' 页面)</string>
   <string name="c_history_comment">备注</string>
   <string name="c_save_history">保存历史记录</string>
   <string name="c_edit_history">修改历史记录</string>
@@ -140,7 +113,6 @@
   <string name="c_copy_description">复制描述</string>
   <string name="c_copy_value">复制值</string>
   <string name="c_first_start_text">感谢您选择Calculator++！\n\nCalculator++ 是一款超强的日常计算工具。</string>
-  <string name="c_first_start_text_title">欢迎</string>
   <string name="c_calc_show_release_notes_title">显示更新日志</string>
   <string name="c_calc_show_release_notes_summary">是否在应用升级之后显示更新日志</string>
   <string name="c_calc_use_back_button_as_prev_summary">设定返回键的行为</string>
@@ -153,13 +125,9 @@
   <string name="c_calc_ad_free_title">支持本项目</string>
   <string name="c_calc_ad_free_summary">并移除广告</string>
   <string name="c_calc_already_purchased">已购买移除广告!</string>
-  <string name="c_calc_purchasing">正在购买&#8230;</string>
-  <string name="c_calc_clearing">正在清除&#8230;</string>
-  <string name="c_feedback_title">反馈</string>
   <string name="c_feedback_text">您已使用 Calculator++ 有一段时间了， \n我们很希望了解您对此应用的意见。\n\n
 请在<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>给 Calculator++评分，\n 并留下您的评价， \n或在<a href="http://facebook.com/calculatorpp">Facebook</a>上讨论。
 	</string>
-  <string name="c_notespp_announce_text">喜讯——我刚刚发布了如下的 Android 应用<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>.\n 如果您对简单便捷地做笔记感兴趣，请点击以下<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes"> 链接</a>试试Notes++ 吧！</string>
   <string name="c_angle_units_changed_to">角度单位已更改为 \'%s\'!</string>
   <string name="c_numeral_base_changed_to">进制已设为\'%s\'!</string>
   <string name="c_conversion_tool">转换工具</string>
@@ -172,18 +140,7 @@
   <string name="other">其他</string>
   <string name="derivatives">衍生工具/积分</string>
   <string name="crashed">Calculator++ 已崩溃</string>
-  <string name="crash_dialog_title">Calculator++ 崩溃报告</string>
-  <string name="crash_dialog_text">Calculator++ 崩溃了。\n\n
-为了修复这个问题我们需要一些有关信息。我们强烈建议通过电子邮件发送一份程序崩溃报告 (按下 \'确定\' 之后， 你将会在新窗口看到所有发送的数据。)\n\n
-是否发送程序崩溃报告？
-	</string>
   <string name="prefs_graph_screen_title">图形设置</string>
-  <string name="prefs_graph_interpolate_function">积分函数图</string>
-  <string name="prefs_graph_interpolate_function_summary">如果选中,立方插值将用于函数图像的绘制</string>
-  <string name="prefs_graph_real_color_title">将实数部分上色</string>
-  <string name="prefs_graph_real_color_summary">设置实数部分的颜色</string>
-  <string name="prefs_graph_imag_color_title">将虚数部分上色</string>
-  <string name="prefs_graph_imag_color_summary">设置虚数部分的颜色</string>
   <string name="p_white_line_color">白色</string>
   <string name="p_grey_line_color">灰色</string>
   <string name="p_red_line_color">红色</string>
@@ -203,7 +160,6 @@
   <string name="empty_function_error">无法创建空函数 ！</string>
   <string name="do_not_show_messages_in_session">不再显示此消息直到下一个会话</string>
   <string name="calculation_messages_dialog_title">Calculator++ 警告</string>
-  <string name="arithmetic_error_while_plot">绘图时出现算术错误: %s</string>
   <string name="ok">确定</string>
   <string name="p_show_calculation_messages_dialog_title">在对话框中显示计算信息</string>
   <string name="p_show_calculation_messages_dialog_summary">如果打开了,如果计算时出现任何消息,将显示特殊对话框</string>
@@ -225,7 +181,6 @@
   <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_onscreen_remove_icon_message">从应用程序设置或通过按下一个按钮，您可以在应用程序的列表中删除第二个图标</string>
   <string name="cpp_this_change_may_require_reboot">此更改可能需要重新启动</string>
   <string name="cpp_plot_2d">2D 绘图</string>
   <string name="cpp_plot_3d">3D 绘图</string>
@@ -235,8 +190,8 @@
   <string name="cpp_monochrome_line_color_type">单色</string>
   <string name="cpp_color_map_line_color_type">彩色地图（只有3D）</string>
   <string name="cpp_solid_line_style">实线(-----)</string>
-  <string name="cpp_dashed_line_style">虚线 (--)</string>
-  <string name="cpp_dotted_line_style">点虚线 (......)</string>
+  <string name="cpp_dashed_line_style">虚线 (- -)</string>
+  <string name="cpp_dotted_line_style">点虚线 (. . .)</string>
   <string name="cpp_dash_dotted_line_style">圆点虚线 (-.-.-)</string>
   <string name="cpp_plotter">函数绘图仪</string>
   <string name="cpp_plot_screenshot">屏幕截图</string>
@@ -266,7 +221,11 @@
   <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_purchase_thank_you_text">谢谢您支持此应用程序! \n\n 可能要花费几分钟应用程序才会通知购买事项。您可以在您的 Google 帐户始终检查购买有关的信息 \n 如果您有任何问题或问题,请随时直接与我联系 （联系人在 Main 中-&gt; 菜单-&gt; 关于)</string>
   <string name="cpp_var_show_greek_keyboard">显示希腊字母</string>
   <string name="cpp_var_hide_greek_keyboard">隐藏希腊字母</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-zh-rtw/text_about.xml b/android-app/src/main/res/values-zh-rtw/text_about.xml
index a66a36ac..39f335ff 100644
--- a/android-app/src/main/res/values-zh-rtw/text_about.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_about.xml
@@ -3,10 +3,10 @@
 <!--Generated by crowdin.net-->
 <resources>
   <string name="c_about">關於</string>
-  <string name="c_about_content">版權所有 © 2009–2013\n\n<b>serso 又名 se.solovyev 製作</b>\n\nFacebook 上我們：<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n此程式依據 Apache 2.0 授權條款發布：\n原始碼可以在這裡找到\n<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n更多資訊請以電子郵件聯繫作者\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n或造訪\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n 如果你想要支持這個計畫\n你可以在應用程式偏好選項中購買特別選項\n\n如果你喜歡這個應用程式\n將它評分為5顆星\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n這個應用程式使用了以下開源庫:\n<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>	
+  <string name="c_about_content">版權所有 © 2009–2013\n\n<b>serso 又名 se.solovyev 製作</b>\n\n我們在Facebook 上：<a href="http://facebook.com/calculatorpp">http://facebook.com/calculatorpp</a>\n\n此程式依據 Apache 2.0 授權條款發布：\n原始碼可以在這裡找到\n<a href="https://github.com/serso/android-calculatorpp">http://github.com</a>\n\n更多資訊請\n以電子郵件聯繫作者\n<a href="mailto:se.solovyev@gmail.com">se.solovyev@gmail.com</a>\n或造訪\n<a href="http://se.solovyev.org">http://se.solovyev.org</a>\n\n 如果你想要支持這個計畫\n你可以在應用程式偏好選項中購買特別選項\n\n如果你喜歡這個應用程式\n將它評分為5顆星於\n<a href="https://market.android.com/details?id=org.solovyev.android.calculator">Google Play</a>\n\n這個應用程式使用了以下開源庫:\n<a href="http://simple.sourceforge.net">Simple (XML serialization)</a>\n<a href="http://meditorworld.appspot.com/meditor.txt">JSCL</a>	
 	</string>
   <string name="cpp_translators_text">翻譯這個應用程式成繁體中文:</string>
-  <string name="cpp_translators_list">Ryan Rao &amp; tomyeh0510 &amp; WeiHanWu</string>
+  <string name="cpp_translators_list">Ryan Rao\ntomyeh0510\nWeiHanWu</string>
   <string name="c_release_notes">發行紀錄</string>
   <string name="c_release_notes_for_title">"發行版本說明"</string>
   <string name="cpp_share_link">http://www.facebook.com/calculatorpp</string>
diff --git a/android-app/src/main/res/values-zh-rtw/text_functions.xml b/android-app/src/main/res/values-zh-rtw/text_functions.xml
index 47a0a9c0..290380a2 100644
--- a/android-app/src/main/res/values-zh-rtw/text_functions.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_functions.xml
@@ -31,11 +31,11 @@
 	</string>
   <string name="c_fun_description_gt">大於函數 - 如果第一個參數大於第二個，值為 1，否則為 0
 	</string>
-  <string name="c_fun_description_rad">將 Degrees 轉換為 Radians：d - 度，m - 分（預設 = 0），s - 秒（預設 = 0）
+  <string name="c_fun_description_rad">將 度(Degrees) 轉換為 弧度(Radians)：d - 度，m - 分（預設 = 0），s - 秒（預設 = 0）
 	</string>
-  <string name="c_fun_description_dms">將 Degrees 從 DMS（度分秒）表示法轉換為十進位：d - 度，m - 分（預設 = 0），s - 秒（預設 = 0）
+  <string name="c_fun_description_dms">將 度(Degrees) 從 DMS（度分秒）表示法轉換為十進位：d - 度，m - 分（預設 = 0），s - 秒（預設 = 0）
 	</string>
-  <string name="c_fun_description_deg">將 Radians 轉換為 Degrees</string>
+  <string name="c_fun_description_deg">將 弧度(Radians) 轉換為 度(Degrees)</string>
   <string name="c_fun_category_trig">三角函數</string>
   <string name="c_fun_category_hyper_trig">雙曲三角函數</string>
   <string name="c_fun_category_comparison">比較函數</string>
diff --git a/android-app/src/main/res/values-zh-rtw/text_operators.xml b/android-app/src/main/res/values-zh-rtw/text_operators.xml
index cfec4e22..339473fc 100644
--- a/android-app/src/main/res/values-zh-rtw/text_operators.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_operators.xml
@@ -4,14 +4,14 @@
 <resources>
   <string name="c_operators">運算子</string>
   <string name="c_op_description_mod">取 \'x\' 除以 \'y\' 的餘數</string>
-  <string name="c_op_description_sum">總和函數 \'f(i)\'，累加 \'i\' 從 \"從\" 到 \"到\"
+  <string name="c_op_description_sum">總和函數 \'f(i)\'，累加 \'i\' 從 \"from\" 到 \"to\"
 	</string>
-  <string name="c_op_description_product">乘積函數 \'f(i)\'，累乘 \'i\' 從 \"從\" 到 \"到\"
+  <string name="c_op_description_product">乘積函數 \'f(i)\'，累乘 \'i\' 從 \"from\" 到 \"to\"
 	</string>
   <string name="c_op_description_derivative">以 \'x\' 變數及順序 \'order\'（預設 = 1）表示函數 \'f(x)\' 的導數，並計算在 \'x_point\'（預設 = 等同 \'x\'）點的值
 	</string>
-  <string name="c_op_description_integral">以 \'x\' 表示函數 \'f(x)\' 的積分</string>
-  <string name="c_op_description_integral_ab">\'x\' 從 \'a\' 到 \'b\' 積分函數 \'f(x)\'
+  <string name="c_op_description_integral">以 \'x\' 變數表示函數 \'f(x)\' 的積分</string>
+  <string name="c_op_description_integral_ab">\'x\' 變數從 \'a\' 到 \'b\' 積分函數 \'f(x)\'
 	</string>
   <string name="c_pf_description_factorial">計算前面算式的階層</string>
   <string name="c_pf_description_double_factorial">計算前面算式的兩次階層</string>
@@ -21,7 +21,7 @@
 100 * 50% = 50\n
 100 + 100 * 50% * 50% = 125
 	</string>
-  <string name="c_pf_description_degree">轉換 Degrees 為 Radians。\n
+  <string name="c_pf_description_degree">轉換 度(Degrees) 為 弧度(Radians)。\n
 例如:\n
 268° = 4.67748\n
 30.21° = 0.52726
diff --git a/android-app/src/main/res/values-zh-rtw/text_preferences.xml b/android-app/src/main/res/values-zh-rtw/text_preferences.xml
index 5eae6630..315fd557 100644
--- a/android-app/src/main/res/values-zh-rtw/text_preferences.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_preferences.xml
@@ -9,8 +9,8 @@
   <string name="c_hide_numeral_base_digits_title">隱藏其他進位制的數字</string>
   <string name="c_hide_numeral_base_digits_summary">如果啟用，其他進位制的數字將被隱藏
 	</string>
-  <string name="prefs_history_show_intermediate_calculations_title">歷史紀錄中顯示中間計算過程</string>
-  <string name="prefs_history_show_intermediate_calculations_summary">如果啟用，所有計算內容將會顯示在歷史紀錄頁面
+  <string name="prefs_history_show_intermediate_calculations_title">在歷史紀錄中顯示中間計算過程</string>
+  <string name="prefs_history_show_intermediate_calculations_summary">如果啟用，所有計算過程將會顯示在歷史紀錄頁面
 	</string>
   <string name="p_calculations_calculate_on_fly_title">輸入時同時計算結果</string>
   <string name="p_calculations_calculate_on_fly_summary">如果啟用，輸入時自動計算</string>
diff --git a/android-app/src/main/res/values-zh-rtw/text_strings.xml b/android-app/src/main/res/values-zh-rtw/text_strings.xml
index b933e324..563f1de9 100644
--- a/android-app/src/main/res/values-zh-rtw/text_strings.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_strings.xml
@@ -4,25 +4,17 @@
 <resources>
   <string name="c_app_name">Calculator++</string>
   <string name="c_app_name_on_screen">Calculator++（視窗模式）</string>
-  <string name="c_app_icon_name">Calc++</string>
   <string name="c_app_settings">設定</string>
-  <string name="c_syntax_error">錯誤</string>
   <string name="c_result_copied">計算結果已複製至剪貼簿！</string>
   <string name="c_settings">設定</string>
   <string name="c_help">幫助</string>
   <string name="c_vars_and_constants">變數與常數</string>
-  <string name="c_prefs_main_category">主要設定</string>
   <string name="c_prefs_calculations_category">計算設定</string>
   <string name="c_prefs_appearance_category">外觀設定</string>
   <string name="c_prefs_other_category">其他設定</string>
-  <string name="c_prefs_drag_button_category">按鍵滑動設定</string>
-  <string name="c_down">下</string>
-  <string name="c_up">上</string>
-  <string name="c_restart">重新啟動</string>
   <string name="c_undo">復原</string>
   <string name="c_redo">重做</string>
   <string name="c_clear">C</string>
-  <string name="c_paste">貼上</string>
   <string name="c_vars">變數</string>
   <string name="c_copy">複製</string>
   <string name="c_plot">繪圖</string>
@@ -39,7 +31,6 @@
   <string name="p_calc_max_calculation_time_summary">如果計算超出指定時間 - 停止計算並顯示錯誤
 	</string>
   <string name="c_exit">離開</string>
-  <string name="c_add">新增</string>
   <string name="c_cancel">取消</string>
   <string name="c_save">儲存</string>
   <string name="c_remove">刪除</string>
@@ -58,41 +49,33 @@
   <string name="c_var_already_exists">已經有相同名稱的變數存在！</string>
   <string name="c_name_is_not_valid">常數名稱無效：名稱必須以英文字母開頭，可以包含字母，數字及底線。
 	</string>
-  <string name="c_sys_var_cannot_be_changed">不能更改系統變數！</string>
   <string name="c_calc_editor_hint">輸入新的算式</string>
-  <string name="c_press_to_copy">按下以複製</string>
-  <string name="c_continue">繼續</string>
   <string name="c_history">歷史紀錄</string>
   <string name="c_history_button">M</string>
-  <string name="c_history_is_empty">沒有歷史紀錄！</string>
-  <string name="c_app_history">歷史紀錄</string>
   <string name="c_char_is_not_accepted">變數名稱不可使用字元 \'%s\'！</string>
   <string name="c_calc_angle_units">目前角度單位</string>
-  <string name="p_deg">Degrees</string>
-  <string name="p_rad">Radians</string>
-  <string name="p_grad">Gradians</string>
-  <string name="p_turns">Turns</string>
+  <string name="p_deg">度 (Degrees)</string>
+  <string name="p_rad">弧度 (Radians)</string>
+  <string name="p_grad">梯度 (Gradians)</string>
+  <string name="p_turns">轉 (Turns)</string>
   <string name="c_angle_units_summary">選擇計算中使用的角度單位</string>
   <string name="c_calc_numeral_bases">目前進位制</string>
   <string name="c_numeral_bases_summary">選擇計算中使用的進位制</string>
-  <string name="p_dec">十進位</string>
-  <string name="p_hex">十六進位</string>
-  <string name="p_oct">八進位</string>
-  <string name="p_bin">二進位</string>
+  <string name="p_dec">十進位 (Decimal)</string>
+  <string name="p_hex">十六進位 (Hexadecimal)</string>
+  <string name="p_oct">八進位 (Octal)</string>
+  <string name="p_bin">二進位 (Binary)</string>
   <string name="c_calc_theme">主題風格</string>
-  <string name="p_default_theme">灰色</string>
-  <string name="p_violet_theme">紫色</string>
-  <string name="p_light_blue_theme">淺藍色</string>
   <string name="p_metro_blue_theme">現代藍</string>
   <string name="p_metro_green_theme">現代綠</string>
   <string name="p_metro_purple_theme">現代紫</string>
-  <string name="c_calc_result_precision_summary">計算結果值的精確度（不論選項值為多少，所有計算都使用最大精確度）
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
+  <string name="c_calc_result_precision_summary">計算結果值的精確度（不論選項值為多少，所有計算過程都使用最大精確度）
 	</string>
   <string name="c_calc_color_display_summary">切換計算機編輯框顏色與樣式的渲染</string>
   <string name="c_calc_theme_summary">設定計算機的主題風格</string>
-  <string name="c_clear_history">清除歷史記錄</string>
   <string name="c_toggle_datetime">顯示/隱藏日期</string>
-  <string name="c_simplify_instead_of_numeric">未定義的常數：{0}！</string>
   <string name="p_grouping_separator_no">沒有撇節符號</string>
   <string name="p_grouping_separator_apostrophe">撇號 (\')</string>
   <string name="p_grouping_separator_space">空格 ( )</string>
@@ -101,7 +84,6 @@
   <string name="c_calc_multiplication_sign">乘號</string>
   <string name="c_calc_multiplication_sign_summary">設定乘號</string>
   <string name="c_calc_layout">版面配置</string>
-  <string name="p_layout_cellphone">科學模式（手機）</string>
   <string name="p_layout_calculator">科學模式</string>
   <string name="p_layout_calculator_mobile">科學模式（大按鍵）</string>
   <string name="p_layout_simple">簡單模式</string>
@@ -109,31 +91,21 @@
   <string name="c_calc_layout_summary">設定按鍵配置</string>
   <string name="c_calc_haptic_feedback_title">觸覺反饋</string>
   <string name="c_calc_haptic_feedback_summary">切換點擊按鍵時是否震動</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
   <string name="p_calc_haptic_feedback_strength_short">短</string>
   <string name="p_calc_haptic_feedback_strength_middle">中</string>
   <string name="p_calc_haptic_feedback_strength_long">長</string>
-  <string name="p_calc_haptic_feedback_duration_title">觸覺反饋持續時間</string>
-  <string name="p_calc_haptic_feedback_duration_summary">點擊按鍵時震動的時間</string>
   <string name="empty_var_error">無法新增空白的常數！</string>
   <string name="not_valid_result">當前計算结果無效！</string>
   <string name="c_plot_graph">圖形</string>
   <string name="c_min_x_value">從</string>
   <string name="c_max_x_value">到</string>
-  <string name="c_swipe_distance">按鍵滑動距離</string>
-  <string name="c_swipe_distance_summary">設定支援附加滑動功能按鍵的滑動距離
-	</string>
-  <string name="c_comment">備註</string>
-  <string name="c_history_item_saved">已儲存</string>
-  <string name="c_history_item_not_saved">未儲存</string>
   <string name="c_expression_copied">算式已複製至剪貼簿！</string>
-  <string name="c_history_item_status">狀態：</string>
-  <string name="c_history_item_comment">備註：</string>
   <string name="c_use">使用</string>
   <string name="c_use_short">使用</string>
   <string name="c_copy_expression">複製算式</string>
   <string name="c_copy_result">複製計算結果</string>
   <string name="c_history_expression">數值</string>
-  <string name="c_history_item_already_saved">已儲存（見 \"已儲存的歷史紀錄\" 頁面）</string>
   <string name="c_history_comment">備註</string>
   <string name="c_save_history">儲存歷史紀錄</string>
   <string name="c_edit_history">修改歷史紀錄</string>
@@ -146,12 +118,11 @@
   <string name="c_copy_description">複製描述</string>
   <string name="c_copy_value">複製數值</string>
   <string name="c_first_start_text">感謝你選擇 Calculator++！\n\nCalculator++ 是強大的日常計算工具。</string>
-  <string name="c_first_start_text_title">歡迎</string>
   <string name="c_calc_show_release_notes_title">顯示發行紀錄</string>
   <string name="c_calc_show_release_notes_summary">選擇是否在升級至新版本後跳出發行紀錄視窗
 	</string>
   <string name="c_calc_use_back_button_as_prev_summary">設定返回鍵的功能</string>
-  <string name="c_calc_use_back_button_as_prev_title">返回鍵以回到先前歷史紀錄</string>
+  <string name="c_calc_use_back_button_as_prev_title">使用返回鍵回到先前歷史紀錄</string>
   <string name="c_clear_billing_info_summary">購買資訊將會從伺服器重新載入</string>
   <string name="c_clear_billing_info_title">更新購買資訊</string>
   <string name="c_warning">警告</string>
@@ -161,44 +132,25 @@
   <string name="c_calc_ad_free_title">支持這個專案</string>
   <string name="c_calc_ad_free_summary">並且移除廣告</string>
   <string name="c_calc_already_purchased">去廣告選項已經購買！</string>
-  <string name="c_calc_purchasing">購買中&#8230;</string>
-  <string name="c_calc_clearing">清除中...</string>
-  <string name="c_feedback_title">意見回饋</string>
   <string name="c_feedback_text">你已經使用 Calculator++ 一些時間了，\n
-瞭解你對這個應用程式的意見對我們而言十分重要。\n\n
-請您評分 Calculator++\n在<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
-Google Play</a>，\n留下評論或是討論這個應用程式\n於
-<a href="http://facebook.com/calculatorpp">Facebook</a>上
-	</string>
-  <string name="c_notespp_announce_text">好消息 - 我剛發布一個 Android 新的應用程式叫做
-<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">Notes++</a>。\n
-如果你對快速而簡單，做筆記的方式有興趣，請點擊<a href="https://play.google.com/store/apps/details?id=org.solovyev.android.notes">這個連結</a>來試試 Notes++！
+知道你對這個應用程式的意見對我們而言十分重要。\n\n
+請您評分 Calculator++\n於<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
+Google Play</a>，\n留下評論或是\n討論這個應用程式\n於
+<a href="http://facebook.com/calculatorpp">Facebook</a>
 	</string>
   <string name="c_angle_units_changed_to">角度單位已改為 \'%s\'！</string>
   <string name="c_numeral_base_changed_to">進位制已改為 \'%s\'！</string>
   <string name="c_conversion_tool">轉換工具</string>
   <string name="c_convert">轉換為&#8230;</string>
-  <string name="convert_to_hex">轉換為十六進位</string>
-  <string name="convert_to_bin">轉換為二進位</string>
-  <string name="convert_to_dec">轉換為十進位</string>
+  <string name="convert_to_hex">轉換為十六進位 (hex)</string>
+  <string name="convert_to_bin">轉換為二進位 (bin)</string>
+  <string name="convert_to_dec">轉換為十進位 (dec)</string>
   <string name="editor">編輯框</string>
   <string name="result">計算結果</string>
   <string name="other">其他</string>
   <string name="derivatives">微分/積分</string>
   <string name="crashed">Calculator++ 已經崩潰&#8230;</string>
-  <string name="crash_dialog_title">Calculator++ 崩潰報告</string>
-  <string name="crash_dialog_text">	Calculator++ 不幸地崩潰了。\n\n
-為了修復這個問題，我們需要一些關於崩潰的資訊。高度建議以電子郵件傳送崩潰報告（按下 \"好\" 後，你會在新視窗中看到所有被發送的資料）\n\n
-你要傳送一個崩潰報告嗎？
-	</string>
   <string name="prefs_graph_screen_title">圖形設定</string>
-  <string name="prefs_graph_interpolate_function">插值函數圖形</string>
-  <string name="prefs_graph_interpolate_function_summary">如果勾選，繪製圖形時將會使用三次插值
-	</string>
-  <string name="prefs_graph_real_color_title">函數圖形實數部分的顏色</string>
-  <string name="prefs_graph_real_color_summary">設定函數圖形實數部分的顏色</string>
-  <string name="prefs_graph_imag_color_title">函數圖形虛數部分的顏色</string>
-  <string name="prefs_graph_imag_color_summary">設定函數圖形虛數部分的顏色</string>
   <string name="p_white_line_color">白色</string>
   <string name="p_grey_line_color">灰色</string>
   <string name="p_red_line_color">紅色</string>
@@ -217,9 +169,8 @@ Google Play</a>，\n留下評論或是討論這個應用程式\n於
   <string name="function_param_not_empty">函數參數不應該是空白！</string>
   <string name="function_removal_confirmation_question">你真的要刪除函數 \'%s\' 嗎？</string>
   <string name="empty_function_error">無法新增空白函數！</string>
-  <string name="do_not_show_messages_in_session">不要顯示這訊息直到下次使用</string>
+  <string name="do_not_show_messages_in_session">不要顯示這訊息直到下次</string>
   <string name="calculation_messages_dialog_title">Calculator++ 警告</string>
-  <string name="arithmetic_error_while_plot">繪圖時發生算術錯誤：%s</string>
   <string name="ok">好</string>
   <string name="p_show_calculation_messages_dialog_title">在對話框中顯示計算訊息</string>
   <string name="p_show_calculation_messages_dialog_summary">如果啟用，計算時任何訊息產生，將會顯示特別的對話框
@@ -238,7 +189,7 @@ Google Play</a>，\n留下評論或是討論這個應用程式\n於
   <string name="c_app_widget_3x4_name">Calculator++ 小工具（3x4）</string>
   <string name="c_app_widget_4x4_name">Calculator++ 小工具（4x4）</string>
   <string name="c_app_widget_4x5_name">Calculator++ 小工具（4x5）</string>
-  <string name="open_onscreen_calculator">點擊以在視窗模式中開啟計算機</string>
+  <string name="open_onscreen_calculator">點擊以視窗模式開啟計算機</string>
   <string name="prefs_onscreen_title">計算機（獨立視窗）設定</string>
   <string name="prefs_onscreen_start_on_boot_title">開機時啟動</string>
   <string name="prefs_onscreen_start_on_boot_summary">如果啟用，Calculator++ 將會在裝置啟動後顯示在通知列
@@ -246,8 +197,6 @@ Google Play</a>，\n留下評論或是討論這個應用程式\n於
   <string name="prefs_onscreen_show_app_icon_title">顯示獨立的圖示（需要重新啟動）</string>
   <string name="prefs_onscreen_show_app_icon_summary">如果啟用，應用程式列表將會顯示第二個圖示
 	</string>
-  <string name="cpp_onscreen_remove_icon_message">您可以在應用程式設定中刪除應用程式列表中第二個圖示，或者點擊下一個按鈕來刪除
-	</string>
   <string name="cpp_this_change_may_require_reboot">這個變動可能需要重新啟動</string>
   <string name="cpp_plot_2d">2D 繪圖</string>
   <string name="cpp_plot_3d">3D 繪圖</string>
@@ -265,7 +214,7 @@ Google Play</a>，\n留下評論或是討論這個應用程式\n於
   <string name="cpp_plot_screenshot_saved">成功儲存截圖：%1$s！</string>
   <string name="cpp_plot_unable_to_save_screenshot">未掛載 SD 卡，無法儲存螢幕截圖。請掛載 SD 卡後再試一次！
 	</string>
-  <string name="cpp_plot_function_line_color_type">線條顏色樣式</string>
+  <string name="cpp_plot_function_line_color_type">線條顏色類型</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>
@@ -283,18 +232,20 @@ Google Play</a>，\n留下評論或是討論這個應用程式\n於
   <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_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 伺服器連同你的帳號，然後你可以輕易地在多個裝置上使用這個應用程式。\n\n
 點擊 \"繼續\" 按鍵，你會被導向至 Google Play 應用程式進行付款。
 	</string>
   <string name="cpp_purchase_title">購買</string>
-  <string name="cpp_purchase_thank_you_text">感謝你支持這個應用程式！\n\n 可能需要幾分鐘後，應用程式才會得知已經購買。你總是可以在你的 Google 帳號中檢查購買資訊。\n
-如果你有任何問題或是疑問，隨意直接聯繫我。（聯絡資訊可以在 主頁 -&gt; 選單 -&gt; 關於 找到）
-	</string>
   <string name="cpp_var_show_greek_keyboard">顯示希臘字母</string>
   <string name="cpp_var_hide_greek_keyboard">隱藏希臘字母</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values-zh-rtw/text_vars.xml b/android-app/src/main/res/values-zh-rtw/text_vars.xml
index 697dd001..dd514b69 100644
--- a/android-app/src/main/res/values-zh-rtw/text_vars.xml
+++ b/android-app/src/main/res/values-zh-rtw/text_vars.xml
@@ -2,14 +2,14 @@
 <!--Generated by crowdin.com-->
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_var_description_PI">圓周長與直徑的比值。注意：這個常數隨角度單位改變 =&gt; rad: 3.14, deg: 180.0
+  <string name="c_var_description_PI">圓周長與直徑的比值。注意：這個常數隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 180.0
 	</string>
-  <string name="c_var_description_pi">圓周長與直徑的比值。注意：這個常數不隨角度單位改變 =&gt; rad: 3.14, deg: 3.14
+  <string name="c_var_description_pi">圓周長與直徑的比值。注意：這個常數不隨角度單位改變 =&gt; 弧度(rad): 3.14, 度(deg): 3.14
 	</string>
   <string name="c_var_description_e">唯一使函數 f(x) = e^x 的微分（切線斜率）在 x = 0 時的值為 1 的實數。
 	</string>
   <string name="c_var_description_i">虛數單位，定義 i^2 = -1</string>
-  <string name="c_var_description_c">真空中的光速，m·s^-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">量子力學中對應能量量子大小的物理常數，
diff --git a/android-app/src/main/res/values/text_strings.xml b/android-app/src/main/res/values/text_strings.xml
index 3046786a..59cd5130 100644
--- a/android-app/src/main/res/values/text_strings.xml
+++ b/android-app/src/main/res/values/text_strings.xml
@@ -2,235 +2,235 @@
 <!--Generated by crowdin.com-->
 <!--Generated by crowdin.net-->
 <resources>
-	<string name="c_app_name">Calculator++</string>
-	<string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-	<string name="c_app_settings">Settings</string>
-	<string name="c_result_copied">Result has been copied to the clipboard!</string>
-	<string name="c_settings">Settings</string>
-	<string name="c_help">Help</string>
-	<string name="c_vars_and_constants">Variables And Constants</string>
-	<string name="c_prefs_calculations_category">Calculation settings</string>
-	<string name="c_prefs_appearance_category">Appearance settings</string>
-	<string name="c_prefs_other_category">Other settings</string>
-	<string name="c_undo">undo</string>
-	<string name="c_redo">redo</string>
-	<string name="c_clear">C</string>
-	<string name="c_vars">vars</string>
-	<string name="c_copy">Copy</string>
-	<string name="c_plot">Plot graph</string>
-	<string name="c_graph">Graph</string>
-	<string name="c_calc_color_display_title">Highlight expressions</string>
-	<string name="c_calc_round_result_title">Round result</string>
-	<string name="c_calc_round_result_summary">Toggles rounding of the result</string>
-	<string name="c_calc_science_notation_title">Always scientific notation</string>
-	<string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output (12.34E-12)</string>
-	<string name="p_calc_result_precision_title">Precision of result</string>
-	<string name="p_calc_max_calculation_time_title">Maximum calculation time</string>
-	<string name="p_calc_max_calculation_time_summary">If calculations exceed specified limit - calculator halts with error</string>
-	<string name="c_exit">Exit</string>
-	<string name="c_cancel">Cancel</string>
-	<string name="c_save">Save</string>
-	<string name="c_remove">Remove</string>
-	<string name="c_yes">Yes</string>
-	<string name="c_no">No</string>
-	<string name="removal_confirmation">Removal confirmation</string>
-	<string name="c_var_removal_confirmation_question">Do you really want to delete \'%s\' variable?</string>
-	<string name="c_var_name">Name</string>
-	<string name="c_var_value">Value</string>
-	<string name="c_var_description">Description</string>
-	<string name="c_var_create_var">Create variable</string>
-	<string name="c_var_edit_var">Edit variable</string>
-	<string name="c_value_is_not_a_number">Value must be either a number or left empty: if you have parameters - create a function instead!</string>
-	<string name="c_var_name_clashes">Variable name clashes with function name!</string>
-	<string name="c_var_already_exists">Variable with the same name already exists!</string>
-	<string name="c_name_is_not_valid">Name of the constant is not valid: name must start with letter, can contain letters, digits and underscore.</string>
-	<string name="c_calc_editor_hint">Enter new expression</string>
-	<string name="c_history">History</string>
-	<string name="c_history_button">M</string>
-	<string name="c_char_is_not_accepted">Character \'%s\' is not accepted in variable name!</string>
-	<string name="c_calc_angle_units">Current angle units</string>
-	<string name="p_deg">Degrees</string>
-	<string name="p_rad">Radians</string>
-	<string name="p_grad">Gradians</string>
-	<string name="p_turns">Turns</string>
-	<string name="c_angle_units_summary">Defines the units for angles to be used in calculations</string>
-	<string name="c_calc_numeral_bases">Current numeral system</string>
-	<string name="c_numeral_bases_summary">Defines the numeral system to be used in calculations</string>
-	<string name="p_dec">Decimal</string>
-	<string name="p_hex">Hexadecimal</string>
-	<string name="p_oct">Octal</string>
-	<string name="p_bin">Binary</string>
-	<string name="c_calc_theme">Theme</string>
-	<string name="p_metro_blue_theme">Metro Blue</string>
-	<string name="p_metro_green_theme">Metro Green</string>
-	<string name="p_metro_purple_theme">Metro Purple</string>
-	<string name="p_material_theme">Material</string>
-	<string name="p_material_light_theme">Material Light</string>
-	<string name="c_calc_result_precision_summary">Precision of the result value (all calculations are done with maximum precision regardless of the value of this option)</string>
-	<string name="c_calc_color_display_summary">Toggles colouring and styling in the calculator editor</string>
-	<string name="c_calc_theme_summary">Sets the theme for calculator</string>
-	<string name="c_toggle_datetime">Show/hide date</string>
-	<string name="p_grouping_separator_no">No grouping separator</string>
-	<string name="p_grouping_separator_apostrophe">Apostrophe (\')</string>
-	<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="c_calc_multiplication_sign">Multiplication sign</string>
-	<string name="c_calc_multiplication_sign_summary">Sets multiplication sign</string>
-	<string name="c_calc_layout">Layout</string>
-	<string name="p_layout_calculator">Scientific</string>
-	<string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
-	<string name="p_layout_simple">Simple</string>
-	<string name="p_layout_simple_mobile">Simple (Big buttons)</string>
-	<string name="c_calc_layout_summary">Sets layout of buttons</string>
-	<string name="c_calc_haptic_feedback_title">Haptic feedback</string>
-	<string name="c_calc_haptic_feedback_summary">Toggles vibration on button click</string>
-	<string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
-	<string name="p_calc_haptic_feedback_strength_short">Short</string>
-	<string name="p_calc_haptic_feedback_strength_middle">Middle</string>
-	<string name="p_calc_haptic_feedback_strength_long">Long</string>
-	<string name="empty_var_error">Unable to create empty constant!</string>
-	<string name="not_valid_result">Current result is not valid!</string>
-	<string name="c_plot_graph">Graph</string>
-	<string name="c_min_x_value">From</string>
-	<string name="c_max_x_value">To</string>
-	<string name="c_expression_copied">Expression copied to the clipboard!</string>
-	<string name="c_use">Use</string>
-	<string name="c_use_short">Use</string>
-	<string name="c_copy_expression">Copy expression</string>
-	<string name="c_copy_result">Copy result</string>
-	<string name="c_history_expression">Value</string>
-	<string name="c_history_comment">Comment</string>
-	<string name="c_save_history">Save history</string>
-	<string name="c_edit_history">Modify history</string>
-	<string name="c_edit">Modify</string>
-	<string name="c_saved_history">Saved history</string>
-	<string name="c_history_already_saved">History was already saved!</string>
-	<string name="c_history_must_be_saved">History must be saved before editing!</string>
-	<string name="c_history_was_removed">History has been successfully removed!</string>
-	<string name="c_history_saved">History has been successfully saved!</string>
-	<string name="c_copy_description">Copy description</string>
-	<string name="c_copy_value">Copy value</string>
-	<string name="c_first_start_text">Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making everyday calculations.</string>
-	<string name="c_calc_show_release_notes_title">Show release notes</string>
-	<string name="c_calc_show_release_notes_summary">Defines if release notes popup window should appear after update to the new version</string>
-	<string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
-	<string name="c_calc_use_back_button_as_prev_title">Use Back button for previous history</string>
-	<string name="c_clear_billing_info_summary">Purchase information will be reloaded from the server</string>
-	<string name="c_clear_billing_info_title">Update purchase information</string>
-	<string name="c_warning">Warning</string>
-	<string name="c_error">Error</string>
-	<string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google account and must be connected to the internet.</string>
-	<string name="c_calc_ad_free_title">Support the project</string>
-	<string name="c_calc_ad_free_summary">And remove the advertisement</string>
-	<string name="c_calc_already_purchased">Ad free option has been already purchased!</string>
-	<string name="c_feedback_text">You have been using Calculator++ for some time \n
+  <string name="c_app_name">Calculator++</string>
+  <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
+  <string name="c_app_settings">Settings</string>
+  <string name="c_result_copied">Result has been copied to the clipboard!</string>
+  <string name="c_settings">Settings</string>
+  <string name="c_help">Help</string>
+  <string name="c_vars_and_constants">Variables And Constants</string>
+  <string name="c_prefs_calculations_category">Calculation settings</string>
+  <string name="c_prefs_appearance_category">Appearance settings</string>
+  <string name="c_prefs_other_category">Other settings</string>
+  <string name="c_undo">undo</string>
+  <string name="c_redo">redo</string>
+  <string name="c_clear">C</string>
+  <string name="c_vars">vars</string>
+  <string name="c_copy">Copy</string>
+  <string name="c_plot">Plot graph</string>
+  <string name="c_graph">Graph</string>
+  <string name="c_calc_color_display_title">Highlight expressions</string>
+  <string name="c_calc_round_result_title">Round result</string>
+  <string name="c_calc_round_result_summary">Toggles rounding of the result</string>
+  <string name="c_calc_science_notation_title">Always scientific notation</string>
+  <string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output (12.34E-12)</string>
+  <string name="p_calc_result_precision_title">Precision of result</string>
+  <string name="p_calc_max_calculation_time_title">Maximum calculation time</string>
+  <string name="p_calc_max_calculation_time_summary">If calculations exceed specified limit - calculator halts with error</string>
+  <string name="c_exit">Exit</string>
+  <string name="c_cancel">Cancel</string>
+  <string name="c_save">Save</string>
+  <string name="c_remove">Remove</string>
+  <string name="c_yes">Yes</string>
+  <string name="c_no">No</string>
+  <string name="removal_confirmation">Removal confirmation</string>
+  <string name="c_var_removal_confirmation_question">Do you really want to delete \'%s\' variable?</string>
+  <string name="c_var_name">Name</string>
+  <string name="c_var_value">Value</string>
+  <string name="c_var_description">Description</string>
+  <string name="c_var_create_var">Create variable</string>
+  <string name="c_var_edit_var">Edit variable</string>
+  <string name="c_value_is_not_a_number">Value must be either a number or left empty: if you have parameters - create a function instead!</string>
+  <string name="c_var_name_clashes">Variable name clashes with function name!</string>
+  <string name="c_var_already_exists">Variable with the same name already exists!</string>
+  <string name="c_name_is_not_valid">Name of the constant is not valid: name must start with letter, can contain letters, digits and underscore.</string>
+  <string name="c_calc_editor_hint">Enter new expression</string>
+  <string name="c_history">History</string>
+  <string name="c_history_button">M</string>
+  <string name="c_char_is_not_accepted">Character \'%s\' is not accepted in variable name!</string>
+  <string name="c_calc_angle_units">Current angle units</string>
+  <string name="p_deg">Degrees</string>
+  <string name="p_rad">Radians</string>
+  <string name="p_grad">Gradians</string>
+  <string name="p_turns">Turns</string>
+  <string name="c_angle_units_summary">Defines the units for angles to be used in calculations</string>
+  <string name="c_calc_numeral_bases">Current numeral system</string>
+  <string name="c_numeral_bases_summary">Defines the numeral system to be used in calculations</string>
+  <string name="p_dec">Decimal</string>
+  <string name="p_hex">Hexadecimal</string>
+  <string name="p_oct">Octal</string>
+  <string name="p_bin">Binary</string>
+  <string name="c_calc_theme">Theme</string>
+  <string name="p_metro_blue_theme">Metro Blue</string>
+  <string name="p_metro_green_theme">Metro Green</string>
+  <string name="p_metro_purple_theme">Metro Purple</string>
+  <string name="p_material_theme">Material</string>
+  <string name="p_material_light_theme">Material Light</string>
+  <string name="c_calc_result_precision_summary">Precision of the result value (all calculations are done with maximum precision regardless of the value of this option)</string>
+  <string name="c_calc_color_display_summary">Toggles colouring and styling in the calculator editor</string>
+  <string name="c_calc_theme_summary">Sets the theme for calculator</string>
+  <string name="c_toggle_datetime">Show/hide date</string>
+  <string name="p_grouping_separator_no">No grouping separator</string>
+  <string name="p_grouping_separator_apostrophe">Apostrophe (\')</string>
+  <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="c_calc_multiplication_sign">Multiplication sign</string>
+  <string name="c_calc_multiplication_sign_summary">Sets multiplication sign</string>
+  <string name="c_calc_layout">Layout</string>
+  <string name="p_layout_calculator">Scientific</string>
+  <string name="p_layout_calculator_mobile">Scientific (Big buttons)</string>
+  <string name="p_layout_simple">Simple</string>
+  <string name="p_layout_simple_mobile">Simple (Big buttons)</string>
+  <string name="c_calc_layout_summary">Sets layout of buttons</string>
+  <string name="c_calc_haptic_feedback_title">Haptic feedback</string>
+  <string name="c_calc_haptic_feedback_summary">Toggles vibration on button click</string>
+  <string name="p_calc_haptic_feedback_strength_disabled">Disabled</string>
+  <string name="p_calc_haptic_feedback_strength_short">Short</string>
+  <string name="p_calc_haptic_feedback_strength_middle">Middle</string>
+  <string name="p_calc_haptic_feedback_strength_long">Long</string>
+  <string name="empty_var_error">Unable to create empty constant!</string>
+  <string name="not_valid_result">Current result is not valid!</string>
+  <string name="c_plot_graph">Graph</string>
+  <string name="c_min_x_value">From</string>
+  <string name="c_max_x_value">To</string>
+  <string name="c_expression_copied">Expression copied to the clipboard!</string>
+  <string name="c_use">Use</string>
+  <string name="c_use_short">Use</string>
+  <string name="c_copy_expression">Copy expression</string>
+  <string name="c_copy_result">Copy result</string>
+  <string name="c_history_expression">Value</string>
+  <string name="c_history_comment">Comment</string>
+  <string name="c_save_history">Save history</string>
+  <string name="c_edit_history">Modify history</string>
+  <string name="c_edit">Modify</string>
+  <string name="c_saved_history">Saved history</string>
+  <string name="c_history_already_saved">History was already saved!</string>
+  <string name="c_history_must_be_saved">History must be saved before editing!</string>
+  <string name="c_history_was_removed">History has been successfully removed!</string>
+  <string name="c_history_saved">History has been successfully saved!</string>
+  <string name="c_copy_description">Copy description</string>
+  <string name="c_copy_value">Copy value</string>
+  <string name="c_first_start_text">Thank you for choosing Calculator++!\n\nCalculator++ is a powerful tool for making everyday calculations.</string>
+  <string name="c_calc_show_release_notes_title">Show release notes</string>
+  <string name="c_calc_show_release_notes_summary">Defines if release notes popup window should appear after update to the new version</string>
+  <string name="c_calc_use_back_button_as_prev_summary">Defines the behaviour of the Back button</string>
+  <string name="c_calc_use_back_button_as_prev_title">Use Back button for previous history</string>
+  <string name="c_clear_billing_info_summary">Purchase information will be reloaded from the server</string>
+  <string name="c_clear_billing_info_title">Update purchase information</string>
+  <string name="c_warning">Warning</string>
+  <string name="c_error">Error</string>
+  <string name="c_billing_error">Billing is not supported: you must have Google Checkout account linked to your Google account and must be connected to the internet.</string>
+  <string name="c_calc_ad_free_title">Support the project</string>
+  <string name="c_calc_ad_free_summary">And remove the advertisement</string>
+  <string name="c_calc_already_purchased">Ad free option has been already purchased!</string>
+  <string name="c_feedback_text">You have been using Calculator++ for some time \n
 		and it\'s important for us to know your opinion about application.\n\n
 		Please rate Calculator++ \non<a href="https://market.android.com/details?id=org.solovyev.android.calculator">
 			Google Play</a>,\n leave a comment or \ndiscuss the application \non
 		<a href="http://facebook.com/calculatorpp">Facebook</a></string>
-	<string name="c_angle_units_changed_to">Angle units have been changed to \'%s\'!</string>
-	<string name="c_numeral_base_changed_to">Numeral base has been changed to \'%s\'!</string>
-	<string name="c_conversion_tool">Conversion tool</string>
-	<string name="c_convert">Convert to&#8230;</string>
-	<string name="convert_to_hex">Convert to hex</string>
-	<string name="convert_to_bin">Convert to bin</string>
-	<string name="convert_to_dec">Convert to dec</string>
-	<string name="editor">Editor</string>
-	<string name="result">Result</string>
-	<string name="other">Other</string>
-	<string name="derivatives">Derivatives/Integrals</string>
-	<string name="crashed">Calculator++ has crashed&#8230;</string>
-	<string name="prefs_graph_screen_title">Graph settings</string>
-	<string name="p_white_line_color">White</string>
-	<string name="p_grey_line_color">Grey</string>
-	<string name="p_red_line_color">Red</string>
-	<string name="p_blue_line_color">Blue</string>
-	<string name="p_green_line_color">Green</string>
-	<string name="c_function_name">Name</string>
-	<string name="c_function_value">Value</string>
-	<string name="c_function_description">Description</string>
-	<string name="c_function_parameters">Parameters</string>
-	<string name="function_create_function">Create function</string>
-	<string name="function_edit_function">Edit function</string>
-	<string name="function_name_is_not_valid">Name of function is not valid: name must start with a letter, can contain letters, digits and underscore.</string>
-	<string name="function_already_exists">Function with the same name already exists!</string>
-	<string name="function_is_empty">Function body could not be empty!</string>
-	<string name="function_param_not_empty">Function parameter should not be empty!</string>
-	<string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
-	<string name="empty_function_error">Unable to create empty function!</string>
-	<string name="do_not_show_messages_in_session">Do not show this message until next session</string>
-	<string name="calculation_messages_dialog_title">Calculator++ warning</string>
-	<string name="ok">OK</string>
-	<string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
-	<string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations special dialog will be shown</string>
-	<string name="fix">Fix</string>
-	<string name="p_preferred_numeral_base_title">Default numeral system</string>
-	<string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
-	<string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
-	<string name="p_preferred_angle_units_title">Default angle units</string>
-	<string name="p_preferred_angle_units_summary">Defines the default angle units</string>
-	<string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
-	<string name="close">Close</string>
-	<string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
-	<string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
-	<string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
-	<string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
-	<string name="open_onscreen_calculator">Click to open calculator in window mode</string>
-	<string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
-	<string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
-	<string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after device boot</string>
-	<string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
-	<string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list</string>
-	<string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
-	<string name="cpp_plot_2d">2D plot</string>
-	<string name="cpp_plot_3d">3D plot</string>
-	<string name="cpp_plot_functions">Graph functions</string>
-	<string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
-	<string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
-	<string name="cpp_monochrome_line_color_type">Monochrome</string>
-	<string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
-	<string name="cpp_solid_line_style">Solid (-----)</string>
-	<string name="cpp_dashed_line_style">Dashed (- - -)</string>
-	<string name="cpp_dotted_line_style">Dotted (. . .)</string>
-	<string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
-	<string name="cpp_plotter">Function plotter</string>
-	<string name="cpp_plot_screenshot">Capture screenshot</string>
-	<string name="cpp_plot_screenshot_saved">Screenshot has been successfully saved: %1$s!</string>
-	<string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD card and try again!</string>
-	<string name="cpp_plot_function_line_color_type">Line color type</string>
-	<string name="cpp_plot_function_line_color">Line color</string>
-	<string name="cpp_plot_function_line_style">Line style</string>
-	<string name="cpp_plot_function_line_width">Line width</string>
-	<string name="cpp_plot_function_settings">Function settings</string>
-	<string name="cpp_function">Function</string>
-	<string name="cpp_pinned">Pinned</string>
-	<string name="cpp_visible">Visible</string>
-	<string name="cpp_plot_button_text">+plot</string>
-	<string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
-	<string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
-	<string name="cpp_plot_range">Graph range</string>
-	<string name="cpp_fullscreen">Fullscreen</string>
-	<string name="cpp_plot_range_x_min">X Min</string>
-	<string name="cpp_plot_range_x_max">X Max</string>
-	<string name="cpp_plot_range_y_min">Y Min</string>
-	<string name="cpp_plot_range_y_max">Y Max</string>
-	<string name="cpp_invalid_number">Invalid number!</string>
-	<string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
-	<string name="cpp_apply">Apply</string>
-	<string name="cpp_message">Message</string>
-	<string name="cpp_continue">Continue</string>
-	<string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
+  <string name="c_angle_units_changed_to">Angle units have been changed to \'%s\'!</string>
+  <string name="c_numeral_base_changed_to">Numeral base has been changed to \'%s\'!</string>
+  <string name="c_conversion_tool">Conversion tool</string>
+  <string name="c_convert">Convert to&#8230;</string>
+  <string name="convert_to_hex">Convert to hex</string>
+  <string name="convert_to_bin">Convert to bin</string>
+  <string name="convert_to_dec">Convert to dec</string>
+  <string name="editor">Editor</string>
+  <string name="result">Result</string>
+  <string name="other">Other</string>
+  <string name="derivatives">Derivatives/Integrals</string>
+  <string name="crashed">Calculator++ has crashed&#8230;</string>
+  <string name="prefs_graph_screen_title">Graph settings</string>
+  <string name="p_white_line_color">White</string>
+  <string name="p_grey_line_color">Grey</string>
+  <string name="p_red_line_color">Red</string>
+  <string name="p_blue_line_color">Blue</string>
+  <string name="p_green_line_color">Green</string>
+  <string name="c_function_name">Name</string>
+  <string name="c_function_value">Value</string>
+  <string name="c_function_description">Description</string>
+  <string name="c_function_parameters">Parameters</string>
+  <string name="function_create_function">Create function</string>
+  <string name="function_edit_function">Edit function</string>
+  <string name="function_name_is_not_valid">Name of function is not valid: name must start with a letter, can contain letters, digits and underscore.</string>
+  <string name="function_already_exists">Function with the same name already exists!</string>
+  <string name="function_is_empty">Function body could not be empty!</string>
+  <string name="function_param_not_empty">Function parameter should not be empty!</string>
+  <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
+  <string name="empty_function_error">Unable to create empty function!</string>
+  <string name="do_not_show_messages_in_session">Do not show this message until next session</string>
+  <string name="calculation_messages_dialog_title">Calculator++ warning</string>
+  <string name="ok">OK</string>
+  <string name="p_show_calculation_messages_dialog_title">Show calculation messages in dialog</string>
+  <string name="p_show_calculation_messages_dialog_summary">If turned on if any message occurred while calculations special dialog will be shown</string>
+  <string name="fix">Fix</string>
+  <string name="p_preferred_numeral_base_title">Default numeral system</string>
+  <string name="p_preferred_numeral_base_summary">Defines the default numeral system</string>
+  <string name="preferred_numeral_base_message">Default numeral system \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
+  <string name="p_preferred_angle_units_title">Default angle units</string>
+  <string name="p_preferred_angle_units_summary">Defines the default angle units</string>
+  <string name="preferred_angle_units_message">Default angle units \'%1$s\' differs from current \'%2$s\'. Forgot to change back?</string>
+  <string name="close">Close</string>
+  <string name="c_app_widget_3x3_name">Calculator++ Widget (3x3)</string>
+  <string name="c_app_widget_3x4_name">Calculator++ Widget (3x4)</string>
+  <string name="c_app_widget_4x4_name">Calculator++ Widget (4x4)</string>
+  <string name="c_app_widget_4x5_name">Calculator++ Widget (4x5)</string>
+  <string name="open_onscreen_calculator">Click to open calculator in window mode</string>
+  <string name="prefs_onscreen_title">Calculator (in separate window) settings</string>
+  <string name="prefs_onscreen_start_on_boot_title">Start on boot</string>
+  <string name="prefs_onscreen_start_on_boot_summary">If turned on Calculator++ will appear in notification bar after device boot</string>
+  <string name="prefs_onscreen_show_app_icon_title">Show separate icon (require reboot)</string>
+  <string name="prefs_onscreen_show_app_icon_summary">If turned on second icon will be shown in applications\' list</string>
+  <string name="cpp_this_change_may_require_reboot">This change may require reboot</string>
+  <string name="cpp_plot_2d">2D plot</string>
+  <string name="cpp_plot_3d">3D plot</string>
+  <string name="cpp_plot_functions">Graph functions</string>
+  <string name="cpp_prefs_graph_plot_imag_title">Plot imaginary part of function</string>
+  <string name="cpp_prefs_graph_plot_imag_summary">If checked imaginary part of function will be plotted</string>
+  <string name="cpp_monochrome_line_color_type">Monochrome</string>
+  <string name="cpp_color_map_line_color_type">Color map (only 3D)</string>
+  <string name="cpp_solid_line_style">Solid (-----)</string>
+  <string name="cpp_dashed_line_style">Dashed (- - -)</string>
+  <string name="cpp_dotted_line_style">Dotted (. . .)</string>
+  <string name="cpp_dash_dotted_line_style">Dot-dashed (-.-.-)</string>
+  <string name="cpp_plotter">Function plotter</string>
+  <string name="cpp_plot_screenshot">Capture screenshot</string>
+  <string name="cpp_plot_screenshot_saved">Screenshot has been successfully saved: %1$s!</string>
+  <string name="cpp_plot_unable_to_save_screenshot">Screenshot cannot be saved as SD card is not mounted. Mount SD card and try again!</string>
+  <string name="cpp_plot_function_line_color_type">Line color type</string>
+  <string name="cpp_plot_function_line_color">Line color</string>
+  <string name="cpp_plot_function_line_style">Line style</string>
+  <string name="cpp_plot_function_line_width">Line width</string>
+  <string name="cpp_plot_function_settings">Function settings</string>
+  <string name="cpp_function">Function</string>
+  <string name="cpp_pinned">Pinned</string>
+  <string name="cpp_visible">Visible</string>
+  <string name="cpp_plot_button_text">+plot</string>
+  <string name="cpp_plot_empty_function_error">Unable to plot empty function!</string>
+  <string name="cpp_plot_too_many_variables">Unable to plot: too many variables!</string>
+  <string name="cpp_plot_range">Graph range</string>
+  <string name="cpp_fullscreen">Fullscreen</string>
+  <string name="cpp_plot_range_x_min">X Min</string>
+  <string name="cpp_plot_range_x_max">X Max</string>
+  <string name="cpp_plot_range_y_min">Y Min</string>
+  <string name="cpp_plot_range_y_max">Y Max</string>
+  <string name="cpp_invalid_number">Invalid number!</string>
+  <string name="cpp_plot_boundaries_should_differ">Graph boundaries should not be the same!</string>
+  <string name="cpp_apply">Apply</string>
+  <string name="cpp_message">Message</string>
+  <string name="cpp_continue">Continue</string>
+  <string name="cpp_purchase_text">Supporting the project is easy and secure: purchase process is provided by Google
 		and all you need is a properly configured Google account.\n\n
 		Payment information is stored in Google servers with your Google account and you can easily use this application on
 		several devices.\n\n
 		By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.</string>
-	<string name="cpp_purchase_title">Purchase</string>
-	<string name="cpp_var_show_greek_keyboard">Show Greek letters</string>
-	<string name="cpp_var_hide_greek_keyboard">Hide Greek letters</string>
-	<string name="cpp_clear_history_title">Clear history?</string>
-	<string name="cpp_clear_history_message">All history will be cleared.</string>
-	<string name="cpp_clear_history">Clear</string>
-	<string name="cpp_new_in_version">New in %1$s version</string>
-	<string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
+  <string name="cpp_purchase_title">Purchase</string>
+  <string name="cpp_var_show_greek_keyboard">Show Greek letters</string>
+  <string name="cpp_var_hide_greek_keyboard">Hide Greek letters</string>
+  <string name="cpp_clear_history_title">Clear history?</string>
+  <string name="cpp_clear_history_message">All history will be cleared.</string>
+  <string name="cpp_clear_history">Clear</string>
+  <string name="cpp_new_in_version">New in %1$s version</string>
+  <string name="cpp_release_notes_choose_theme">Do you want to try new Material themes? Choose them from the list:</string>
 </resources>
diff --git a/android-app/src/main/res/values/text_vars.xml b/android-app/src/main/res/values/text_vars.xml
index cf3b8306..faf29ae9 100644
--- a/android-app/src/main/res/values/text_vars.xml
+++ b/android-app/src/main/res/values/text_vars.xml
@@ -2,23 +2,13 @@
 <!--Generated by crowdin.com-->
 <!--Generated by crowdin.net-->
 <resources>
-  <string name="c_var_description_PI">Ratio of any circle\'s circumference to its diameter. Note: this constant is
-		degree unit dependent =&gt; rad: 3.14, deg: 180.0
-	</string>
-  <string name="c_var_description_pi">Ratio of any circle\'s circumference to its diameter. Note: this constant is
-		degree unit independent =&gt; rad: 3.14, deg: 3.14
-	</string>
-  <string name="c_var_description_e">Unique real number such that the value of the derivative (slope of the tangent
-		line) of the function f(x) = e^x at the point x = 0 is equal to 1
-	</string>
+  <string name="c_var_description_PI">Ratio of any circle\'s circumference to its diameter. Note: this constant is degree unit dependent =&gt; rad: 3.14, deg: 180.0</string>
+  <string name="c_var_description_pi">Ratio of any circle\'s circumference to its diameter. Note: this constant is degree unit independent =&gt; rad: 3.14, deg: 3.14</string>
+  <string name="c_var_description_e">Unique real number such that the value of the derivative (slope of the tangent line) of the function f(x) = e^x at the point x = 0 is equal to 1</string>
   <string name="c_var_description_i">Imaginary unit, defined such as i^2 = −1</string>
-  <string name="c_var_description_c">Speed of the light in vacuum, m·s</string>
-  <string name="c_var_description_G">The gravitational constant is an empirical physical constant involved in the
-		calculation of the gravitational attraction between objects with mass, m^3·kg^−1·s^−2
-	</string>
-  <string name="c_var_description_h">Physical constant reflecting the sizes of energy quanta in quantum mechanics,
-		J·s
-	</string>
+  <string name="c_var_description_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>
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages.properties b/core/src/main/resources/org/solovyev/android/calculator/messages.properties
index 8d99e5bd..643780f4 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages.properties
@@ -13,3 +13,4 @@ result_copied=Result has been copied to the clipboard\!
 text_copied=Text has been copied to the clipboard\!
 ans_description=Last calculated value
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_ar.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_ar.properties
index 9244e896..83f34d9c 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_ar.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_ar.properties
@@ -13,3 +13,4 @@ result_copied=\u062a\u0645 \u0646\u0633\u062e \u0627\u0644\u0646\u062a\u064a\u06
 text_copied=\u0644\u0642\u062f \u062a\u0645 \u0646\u0633\u062e \u0627\u0644\u0646\u0635 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629\!
 ans_description=\u0627\u0644\u0642\u064a\u0645\u0629 \u0627\u0644\u0645\u062d\u0633\u0648\u0628\u0629 \u0627\u0644\u0645\u0627\u0636\u064a\u0629
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_cs.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_cs.properties
index 444d4d7f..9b3d5540 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_cs.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_cs.properties
@@ -13,3 +13,4 @@ result_copied=V\u00fdsledek byl zkop\u00edrov\u00e1n do schr\u00e1nky\!
 text_copied=Text byl zkop\u00edrov\u00e1n do schr\u00e1nky\!
 ans_description=Posledn\u00ed vypo\u010d\u00edtan\u00e1 hodnota
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_de.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_de.properties
index 2d637921..eaaadd6b 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_de.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_de.properties
@@ -5,7 +5,7 @@ msg_2=Ausdruck zu komplex
 msg_3=Zeit\u00fcberschreitung bei Ausf\u00fchrung - Ausdruck \u00fcberpr\u00fcfen
 msg_4=Auswertung wurde abgebrochen
 msg_5=Parameter f\u00fcr die Funktion fehlen\: {0}
-msg_6=Im Ausdruck wurde eine Endlosschleife  entdeckt  
+msg_6=Im Ausdruck wurde eine Endlosschleife  entdeckt
 msg_7=Einige Benutzerdaten konnten nicht geladen werden. Wenden Sie sich bitte mit den untenstehenden Informationen an den Entwickler.\n\nKann nicht geladen werden\: {0}
 
 syntax_error=Fehler
@@ -13,3 +13,4 @@ result_copied=Ergebnis wurde in die Zwischenablage kopiert\!
 text_copied=Text wurde in die Zwischenablage kopiert\!
 ans_description=Letzter berechneter Wert
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_es_ES.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_es_ES.properties
index 31c00eda..1866e6e8 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_es_ES.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_es_ES.properties
@@ -13,3 +13,4 @@ result_copied=\u00a1El resultado se ha copiado en el portapapeles\!
 text_copied=\u00a1El texto se ha copiado en el portapapeles\!
 ans_description=\u00daltimo valor calculado
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_fi.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_fi.properties
index 00947fdd..2219b40c 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_fi.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_fi.properties
@@ -13,3 +13,4 @@ result_copied=Tulos on kopioitu leikep\u00f6yd\u00e4lle\!
 text_copied=Teksti on kopioitu leikep\u00f6yd\u00e4lle\!
 ans_description=Viimeinen laskettu arvo
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
index 79321889..d9314695 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_fr.properties
@@ -13,3 +13,4 @@ result_copied=Le r\u00e9sultat a \u00e9t\u00e9 copi\u00e9 dans le presse-papier
 text_copied=Le texte a \u00e9t\u00e9 copi\u00e9 dans le presse-papier \!
 ans_description=Derni\u00e8re valeur calcul\u00e9e
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
index 5f5ea13f..d9811923 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_it.properties
@@ -13,3 +13,4 @@ result_copied=Il risultato \u00e8 stato copiato negli appunti\!
 text_copied=Il testo \u00e8 stato copiato negli appunti\!
 ans_description=Ultimo valore calcolato
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_ja.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_ja.properties
index d89fa369..6d7d64ed 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_ja.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_ja.properties
@@ -13,3 +13,4 @@ result_copied=\u8a08\u7b97\u7d50\u679c\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc
 text_copied=\u30c6\u30ad\u30b9\u30c8\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f\uff01
 ans_description=\u6700\u5f8c\u306b\u8a08\u7b97\u3055\u308c\u305f\u5024
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_nl.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_nl.properties
index ded612eb..da4f90d5 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_nl.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_nl.properties
@@ -13,3 +13,4 @@ result_copied=Resultaat is gekopieerd naar het klembord\!
 text_copied=Tekst is naar het klembord gekopieerd\!
 ans_description=Laatst berekende waarde
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_pl.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_pl.properties
index e3cbb6d0..d3798c6c 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_pl.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_pl.properties
@@ -13,3 +13,4 @@ result_copied=Wynik zosta\u0142 skopiowany do schowka\!
 text_copied=Tekst zosta\u0142 skopiowany do schowka\!
 ans_description=Ostatnia obliczona warto\u015b\u0107
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_pt_BR.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_pt_BR.properties
index 49325cfa..eadec20c 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_pt_BR.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_pt_BR.properties
@@ -13,3 +13,4 @@ result_copied=Resultado foi copiado para a \u00e1rea de transfer\u00eancia\!
 text_copied=Texto foi copiado para a \u00e1rea de transfer\u00eancia\!
 ans_description=\u00daltimo valor calculado
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_pt_PT.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_pt_PT.properties
index e3d1c487..732b8282 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_pt_PT.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_pt_PT.properties
@@ -13,3 +13,4 @@ result_copied=O resultado foi copiado para o clipboard\!
 text_copied=O texto foi copiado para o clipboard\!
 ans_description=\u00daltimo valor calculado
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
index b45c0c09..a6cf04c5 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_ru.properties
@@ -13,3 +13,4 @@ result_copied=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0431\u044
 text_copied=\u0422\u0435\u043a\u0441\u0442 \u0431\u044b\u043b \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d \u0432 \u0431\u0443\u0444\u0435\u0440 \u043e\u0431\u043c\u0435\u043d\u0430\!
 ans_description=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u043f\u043e\u0441\u0447\u0438\u0442\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
index 625fc03d..0f7dceff 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_uk.properties
@@ -13,3 +13,4 @@ result_copied=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0432\u043
 text_copied=\u0422\u0435\u043a\u0441\u0442 \u0432\u0436\u0435 \u0441\u043a\u043e\u043f\u0456\u0439\u043e\u0432\u0430\u043d\u043e \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0430 \u043e\u0431\u043c\u0456\u043d\u0443\!
 ans_description=\u041e\u0441\u0442\u0430\u043d\u043d\u0454 \u043e\u0431\u0447\u0438\u0441\u043b\u0435\u043d\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044f
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_vi.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_vi.properties
index 01e4ca7d..220bc587 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_vi.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_vi.properties
@@ -13,3 +13,4 @@ result_copied=K\u1ebft qu\u1ea3 \u0111\u00e3 \u0111\u01b0\u1ee3c sao ch\u00e9p v
 text_copied=V\u0103n b\u1ea3n \u0111\u00e3 \u0111\u01b0\u1ee3c sao ch\u00e9p v\u00e0o clipboard\!
 ans_description=Gi\u00e1 tr\u1ecb t\u00ednh to\u00e1n cu\u1ed1i
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_zh_CN.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_zh_CN.properties
index 50110727..8ad9c204 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_zh_CN.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_zh_CN.properties
@@ -13,3 +13,4 @@ result_copied=\u7ed3\u679c\u5df2\u590d\u5236\u5230\u526a\u8d34\u677f\uff01
 text_copied=\u6587\u672c\u5df2\u590d\u5236\u5230\u526a\u8d34\u677f\uff01
 ans_description=\u4e0a\u4e00\u6b21\u8ba1\u7b97\u6240\u5f97\u503c
 
+
diff --git a/core/src/main/resources/org/solovyev/android/calculator/messages_zh_TW.properties b/core/src/main/resources/org/solovyev/android/calculator/messages_zh_TW.properties
index 7dda43f4..b7d3c417 100644
--- a/core/src/main/resources/org/solovyev/android/calculator/messages_zh_TW.properties
+++ b/core/src/main/resources/org/solovyev/android/calculator/messages_zh_TW.properties
@@ -13,3 +13,4 @@ result_copied=\u8a18\u7b97\u7d50\u679c\u5df2\u8907\u88fd\u81f3\u526a\u8cbc\u7c3f
 text_copied=\u6587\u5b57\u5df2\u8907\u88fd\u5230\u526a\u8cbc\u7c3f \uff01
 ans_description=\u4e0a\u4e00\u6b21\u8a08\u7b97\u6240\u5f97\u6578\u503c
 
+