Settings refactor + Feedback reporter + Translations

2016-05-11 21:47:07 +02:00 · 2016-05-11 21:47:07 +02:00 · 2609cede5b
commit 2609cede5b
parent ed194941c1
116 changed files with 1186 additions and 622 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -23,7 +23,7 @@
        android:allowBackup="true"
        android:hardwareAccelerated="true"
        android:icon="@drawable/ic_launcher"
-        android:label="@string/c_app_name"
+        android:label="@string/cpp_app_name"
        android:theme="@style/Cpp.Theme.Material"
        tools:ignore="UnusedAttribute">

@ -34,7 +34,7 @@
        <activity
            android:name=".CalculatorActivity"
            android:clearTaskOnLaunch="true"
-            android:label="@string/c_app_name"
+            android:label="@string/cpp_app_name"
            android:launchMode="singleTop"
            android:windowSoftInputMode="stateHidden|adjustPan"
            android:theme="@style/Cpp.Theme.Material.Calculator">
@ -178,7 +178,7 @@
        <receiver
            android:name=".widget.CalculatorWidget"
            android:icon="@drawable/ic_launcher"
-            android:label="@string/c_app_name">
+            android:label="@string/cpp_app_name">

            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
--- a/app/src/main/java/org/solovyev/android/calculator/ActivityLauncher.java
+++ b/app/src/main/java/org/solovyev/android/calculator/ActivityLauncher.java
@ -29,7 +29,10 @@ import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
-
+import dagger.Lazy;
+import jscl.math.Generic;
+import jscl.math.function.Constant;
+import jscl.math.function.CustomFunction;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.about.AboutActivity;
 import org.solovyev.android.calculator.functions.CppFunction;
@ -47,18 +50,12 @@ import org.solovyev.android.plotter.PlotFunction;
 import org.solovyev.android.plotter.Plotter;
 import org.solovyev.common.msg.MessageType;

-import java.util.ArrayList;
-import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
-import dagger.Lazy;
-import jscl.math.Generic;
-import jscl.math.function.Constant;
-import jscl.math.function.CustomFunction;
+import java.util.ArrayList;
+import java.util.List;

@Singleton
 public final class ActivityLauncher {
@ -111,8 +108,7 @@ public final class ActivityLauncher {

    public void showWidgetSettings() {
        final Context context = getContext();
-        show(context, PreferencesActivity.makeIntent(context, R.xml.preferences_widget,
-                R.string.prefs_widget_title));
+        show(context, PreferencesActivity.makeIntent(context, R.xml.preferences_widget, R.string.cpp_widget));
    }

    public void showOperators() {
--- a/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@ -38,7 +38,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
-
+import butterknife.Bind;
+import jscl.AngleUnit;
+import jscl.NumeralBase;
 import org.solovyev.android.calculator.converter.ConverterFragment;
 import org.solovyev.android.calculator.history.History;
 import org.solovyev.android.calculator.keyboard.PartialKeyboardUi;
@ -48,10 +50,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;

-import butterknife.Bind;
-import jscl.AngleUnit;
-import jscl.NumeralBase;
-
 public class CalculatorActivity extends BaseActivity implements View.OnClickListener {

    @Nonnull
@ -76,7 +74,7 @@ public class CalculatorActivity extends BaseActivity implements View.OnClickList
    private boolean useBackAsPrevious;

    public CalculatorActivity() {
-        super(R.layout.activity_main, R.string.c_app_name);
+        super(R.layout.activity_main, R.string.cpp_app_name);
    }

    @Override
--- a/app/src/main/java/org/solovyev/android/calculator/Engine.java
+++ b/app/src/main/java/org/solovyev/android/calculator/Engine.java
@ -27,9 +27,15 @@ import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
 import android.text.TextUtils;
-
 import com.squareup.otto.Bus;
-
+import jscl.AngleUnit;
+import jscl.JsclMathEngine;
+import jscl.MathEngine;
+import jscl.NumeralBase;
+import jscl.math.operator.Operator;
+import jscl.text.Identifier;
+import jscl.text.Parser;
+import midpcalc.Real;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.functions.FunctionsRegistry;
 import org.solovyev.android.calculator.math.MathType;
@ -44,6 +50,10 @@ import org.solovyev.common.text.CharacterMapper;
 import org.solovyev.common.text.EnumMapper;
 import org.solovyev.common.text.NumberMapper;

+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.Collections;
@ -51,20 +61,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Executor;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import jscl.AngleUnit;
-import jscl.JsclMathEngine;
-import jscl.MathEngine;
-import jscl.NumeralBase;
-import jscl.math.operator.Operator;
-import jscl.text.Identifier;
-import jscl.text.Parser;
-import midpcalc.Real;
-
@Singleton
 public class Engine implements SharedPreferences.OnSharedPreferenceChangeListener {

@ -339,13 +335,13 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
        public static int angleUnitName(AngleUnit angleUnit) {
            switch (angleUnit) {
                case deg:
-                    return R.string.p_deg;
+                    return R.string.cpp_deg;
                case rad:
-                    return R.string.p_rad;
+                    return R.string.cpp_rad;
                case grad:
-                    return R.string.p_grad;
+                    return R.string.cpp_grad;
                case turns:
-                    return R.string.p_turns;
+                    return R.string.cpp_turns;
            }
            return 0;
        }
@ -354,13 +350,13 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
        public static int numeralBaseName(NumeralBase numeralBase) {
            switch (numeralBase) {
                case bin:
-                    return R.string.p_bin;
+                    return R.string.cpp_bin;
                case oct:
-                    return R.string.p_oct;
+                    return R.string.cpp_oct;
                case dec:
-                    return R.string.p_dec;
+                    return R.string.cpp_dec;
                case hex:
-                    return R.string.p_hex;
+                    return R.string.cpp_hex;
            }
            return 0;
        }
--- a/app/src/main/java/org/solovyev/android/calculator/Preferences.java
+++ b/app/src/main/java/org/solovyev/android/calculator/Preferences.java
@ -38,7 +38,6 @@ import org.solovyev.android.calculator.about.AboutActivity;
 import org.solovyev.android.calculator.functions.FunctionsActivity;
 import org.solovyev.android.calculator.history.HistoryActivity;
 import org.solovyev.android.calculator.language.Languages;
-import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.operators.OperatorsActivity;
 import org.solovyev.android.calculator.preferences.PreferenceEntry;
 import org.solovyev.android.calculator.preferences.PreferencesActivity;
@ -48,13 +47,9 @@ import org.solovyev.android.prefs.*;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.text.DecimalFormatSymbols;
 import java.util.EnumMap;
-import java.util.Locale;
 import java.util.Map;

-import jscl.JsclMathEngine;
-
 import static org.solovyev.android.prefs.IntegerPreference.DEF_VALUE;

 public final class Preferences {
@ -272,7 +267,7 @@ public final class Preferences {
            default_theme(R.style.Cpp_Theme_Gray),
            violet_theme(R.style.Cpp_Theme_Violet),
            light_blue_theme(R.style.Cpp_Theme_Blue),
-            metro_blue_theme(R.string.p_metro_blue_theme, R.style.Cpp_Theme_Metro_Blue, R.style.Cpp_Theme_Metro_Blue_Calculator, R.style.Cpp_Theme_Wizard, R.style.Cpp_Theme_Metro_Blue_Dialog, R.style.Cpp_Theme_Material_Dialog_Alert),
+            metro_blue_theme(R.string.cpp_theme_metro_blue, R.style.Cpp_Theme_Metro_Blue, R.style.Cpp_Theme_Metro_Blue_Calculator, R.style.Cpp_Theme_Wizard, R.style.Cpp_Theme_Metro_Blue_Dialog, R.style.Cpp_Theme_Material_Dialog_Alert),
            metro_purple_theme(R.string.p_metro_purple_theme, R.style.Cpp_Theme_Metro_Purple, R.style.Cpp_Theme_Metro_Purple_Calculator, R.style.Cpp_Theme_Wizard, R.style.Cpp_Theme_Metro_Purple_Dialog, R.style.Cpp_Theme_Material_Dialog_Alert),
            metro_green_theme(R.string.p_metro_green_theme, R.style.Cpp_Theme_Metro_Green, R.style.Cpp_Theme_Metro_Green_Calculator, R.style.Cpp_Theme_Wizard, R.style.Cpp_Theme_Metro_Green_Dialog, R.style.Cpp_Theme_Material_Dialog_Alert),
            material_theme(R.string.cpp_theme_dark, R.style.Cpp_Theme_Material, R.style.Cpp_Theme_Material_Calculator),
@ -377,8 +372,8 @@ public final class Preferences {
        }

        public enum Mode {
-            engineer(R.string.cpp_wizard_mode_engineer),
-            simple(R.string.cpp_wizard_mode_simple);
+            engineer(R.string.cpp_mode_engineer),
+            simple(R.string.cpp_mode_simple);

            @StringRes
            public final int name;
--- a/app/src/main/java/org/solovyev/android/calculator/StartupHelper.java
+++ b/app/src/main/java/org/solovyev/android/calculator/StartupHelper.java
@ -82,8 +82,8 @@ public class StartupHelper {
                }
            });
            builder.setNegativeButton(R.string.cpp_rateus_cancel, null);
-            builder.setMessage(activity.getString(R.string.cpp_rateus_message, activity.getString(R.string.c_app_name)));
-            builder.setTitle(activity.getString(R.string.cpp_rateus_title, activity.getString(R.string.c_app_name)));
+            builder.setMessage(activity.getString(R.string.cpp_rateus_message, activity.getString(R.string.cpp_app_name)));
+            builder.setTitle(activity.getString(R.string.cpp_rateus_title, activity.getString(R.string.cpp_app_name)));
            builder.create().show();
            UiPreferences.rateUsShown.putPreference(editor, true);
        }
--- a/app/src/main/java/org/solovyev/android/calculator/feedback/FeedbackReporter.java
+++ b/app/src/main/java/org/solovyev/android/calculator/feedback/FeedbackReporter.java
@ -0,0 +1,45 @@
+package org.solovyev.android.calculator.feedback;
+
+import android.app.Application;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.util.Log;
+import org.solovyev.android.calculator.R;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class FeedbackReporter {
+
+    private final Application context;
+
+    @Inject
+    public FeedbackReporter(Application context) {
+        this.context = context;
+    }
+
+    public void report() {
+        final Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(Intent.EXTRA_EMAIL, new String[]{"se.solovyev@gmail.com"});
+        final String version = getVersion();
+        intent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.cpp_app_name) + " " + version + " // " + Build.MANUFACTURER + " " + Build.MODEL + " (" + Build.DEVICE + ") " + Build.VERSION.SDK_INT);
+        intent.setType("plain/html");
+        try {
+            context.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Log.e("FeedbackReporter", e.getMessage(), e);
+        }
+    }
+
+    private String getVersion() {
+        try {
+            return context.getPackageManager().getPackageInfo(context.getApplicationInfo().packageName, 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            return "x.x.x";
+        }
+    }
+}
--- a/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorService.java
+++ b/app/src/main/java/org/solovyev/android/calculator/floating/FloatingCalculatorService.java
@ -172,7 +172,7 @@ public class FloatingCalculatorService extends Service implements FloatingViewLi
    private void showNotification() {
        final NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
        builder.setSmallIcon(R.drawable.kb_logo);
-        builder.setContentTitle(getText(R.string.c_app_name));
+        builder.setContentTitle(getText(R.string.cpp_app_name));
        builder.setContentText(getString(R.string.open_onscreen_calculator));
        builder.setOngoing(true);

--- a/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesActivity.java
@ -35,12 +35,11 @@ public class PreferencesActivity extends BaseActivity implements SharedPreferenc

    static {
        preferenceDefs.append(R.xml.preferences, new PrefDef("screen-main", R.string.cpp_settings));
-        preferenceDefs.append(R.xml.preferences_number_format, new PrefDef("screen-number-format", R.string.c_prefs_calculations_category));
-        preferenceDefs.append(R.xml.preferences_calculations, new PrefDef("screen-calculations", R.string.c_prefs_calculations_category));
-        preferenceDefs.append(R.xml.preferences_appearance, new PrefDef("screen-appearance", R.string.c_prefs_appearance_category));
-        preferenceDefs.append(R.xml.preferences_other, new PrefDef("screen-other", R.string.c_prefs_other_category));
-        preferenceDefs.append(R.xml.preferences_onscreen, new PrefDef("screen-onscreen", R.string.prefs_onscreen_title));
-        preferenceDefs.append(R.xml.preferences_widget, new PrefDef("screen-widget", R.string.prefs_widget_title));
+        preferenceDefs.append(R.xml.preferences_number_format, new PrefDef("screen-number-format", R.string.cpp_number_format));
+        preferenceDefs.append(R.xml.preferences_appearance, new PrefDef("screen-appearance", R.string.cpp_appearance));
+        preferenceDefs.append(R.xml.preferences_other, new PrefDef("screen-other", R.string.cpp_other));
+        preferenceDefs.append(R.xml.preferences_onscreen, new PrefDef("screen-onscreen", R.string.cpp_floating_calculator));
+        preferenceDefs.append(R.xml.preferences_widget, new PrefDef("screen-widget", R.string.cpp_widget));
    }

    ActivityCheckout checkout;
--- a/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/preferences/PreferencesFragment.java
@ -11,15 +11,14 @@ import android.support.v4.app.FragmentActivity;
 import android.util.SparseArray;
 import android.view.View;
 import android.widget.ListView;
-
 import com.squareup.otto.Bus;
 import com.squareup.otto.Subscribe;
-
-import org.solovyev.android.calculator.AdView;
-import org.solovyev.android.calculator.Engine;
-import org.solovyev.android.calculator.Preferences;
+import jscl.AngleUnit;
+import jscl.JsclMathEngine;
+import jscl.NumeralBase;
+import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.Preferences.Gui.Theme;
-import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.feedback.FeedbackReporter;
 import org.solovyev.android.calculator.language.Language;
 import org.solovyev.android.calculator.language.Languages;
 import org.solovyev.android.checkout.BillingRequests;
@ -30,16 +29,11 @@ import org.solovyev.android.prefs.StringPreference;
 import org.solovyev.android.wizard.Wizards;
 import org.solovyev.common.text.CharacterMapper;

-import java.util.Arrays;
-import java.util.List;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
-
-import jscl.AngleUnit;
-import jscl.JsclMathEngine;
-import jscl.NumeralBase;
+import java.util.Arrays;
+import java.util.List;

 import static org.solovyev.android.calculator.App.cast;
 import static org.solovyev.android.calculator.Engine.Preferences.angleUnitName;
@ -51,8 +45,6 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc

    private static boolean SUPPORT_HEADERS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
    @Nullable
-    private Preference buyPremiumPreference;
-    @Nullable
    private AdView adView;
    @Inject
    SharedPreferences preferences;
@ -63,6 +55,10 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
    @Inject
    JsclMathEngine engine;
    @Inject
+    FeedbackReporter feedbackReporter;
+    @Inject
+    ActivityLauncher launcher;
+    @Inject
    Bus bus;

    @Nonnull
@ -98,41 +94,21 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc

        final int preference = getPreferencesResId();
        if (preference == R.xml.preferences) {
-            final SparseArray<PreferencesActivity.PrefDef> preferences = PreferencesActivity.getPreferenceDefs();
-            for (int i = 0; i < preferences.size(); i++) {
-                final int xml = preferences.keyAt(i);
-                final PreferencesActivity.PrefDef def = preferences.valueAt(i);
-                setPreferenceIntent(xml, def);
-            }
-            final Preference restartWizardPreference = findPreference("restart_wizard");
-            restartWizardPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    startWizard(wizards, DEFAULT_WIZARD_FLOW, getActivity());
-                    return true;
-                }
-            });
-
-            buyPremiumPreference = findPreference("buy_premium");
-            if (buyPremiumPreference != null) {
-                buyPremiumPreference.setEnabled(false);
-                buyPremiumPreference.setSelectable(false);
-                buyPremiumPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
-                    @Override
-                    public boolean onPreferenceClick(Preference preference) {
-                        startActivity(new Intent(getActivity(), PurchaseDialogActivity.class));
-                        return true;
-                    }
-                });
-            }
-            prepareModePreference();
-            prepareAnglesPreference();
-            prepareRadixPreference();
+            prepareScreens();
+            prepareIntroduction();
+            prepareReportBug();
+            prepareAbout();
+            prepareSupportProject();
+            prepareMode();
+            prepareAngles();
+            prepareRadix();
        } else if (preference == R.xml.preferences_number_format) {
            prepareListPreference(Engine.Preferences.Output.notation, Engine.Notation.class);
            preparePrecisionPreference();
            prepareSeparatorPreference();
            prepareNumberFormatExamplesPreference();
+        } else if (preference == R.xml.preferences_onscreen) {
+            updateFloatingCalculatorPreferences();
        }

        prepareLanguagePreference(preference);
@ -144,9 +120,10 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
                requests.isPurchased(ProductTypes.IN_APP, "ad_free", new RequestListener<Boolean>() {
                    @Override
                    public void onSuccess(@Nonnull Boolean purchased) {
-                        if (buyPremiumPreference != null) {
-                            buyPremiumPreference.setEnabled(!purchased);
-                            buyPremiumPreference.setSelectable(!purchased);
+                        final Preference supportProject = findPreference("prefs.supportProject");
+                        if (supportProject != null) {
+                            supportProject.setEnabled(!purchased);
+                            supportProject.setSelectable(!purchased);
                        }
                        onShowAd(!purchased);
                    }
@ -160,6 +137,63 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
        });
    }

+    private void prepareFloatingCalculatorPreferences() {
+    }
+
+    private void prepareReportBug() {
+        final Preference reportBug = findPreference("prefs.reportBug");
+        reportBug.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                feedbackReporter.report();
+                return true;
+            }
+        });
+
+    }
+
+    private void prepareSupportProject() {
+        final Preference supportProject = findPreference("prefs.supportProject");
+        supportProject.setEnabled(false);
+        supportProject.setSelectable(false);
+        supportProject.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startActivity(new Intent(getActivity(), PurchaseDialogActivity.class));
+                return true;
+            }
+        });
+    }
+
+    private void prepareScreens() {
+        final SparseArray<PreferencesActivity.PrefDef> preferences = PreferencesActivity.getPreferenceDefs();
+        for (int i = 0; i < preferences.size(); i++) {
+            setPreferenceIntent(preferences.keyAt(i), preferences.valueAt(i));
+        }
+    }
+
+    private void prepareIntroduction() {
+        final Preference introduction = findPreference("prefs.introduction");
+        introduction.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                startWizard(wizards, DEFAULT_WIZARD_FLOW, getActivity());
+                return true;
+            }
+        });
+    }
+
+    private void prepareAbout() {
+        final Preference about = findPreference("prefs.about");
+        about.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                launcher.showAbout();
+                return true;
+            }
+        });
+    }
+
    private void prepareNumberFormatExamplesPreference() {
        final NumberFormatExamplesPreference preference = (NumberFormatExamplesPreference) preferenceManager.findPreference("numberFormat.examples");
        if (preference == null) {
@ -183,13 +217,13 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
    private int separatorName(char separator) {
        switch (separator) {
            case '\'':
-                return R.string.p_grouping_separator_apostrophe;
+                return R.string.cpp_thousands_separator_apostrophe;
            case ' ':
-                return R.string.p_grouping_separator_space;
+                return R.string.cpp_thousands_separator_space;
            case 0:
-                return R.string.p_grouping_separator_no;
+                return R.string.cpp_thousands_separator_no;
        }
-        return R.string.p_grouping_separator_no;
+        return R.string.cpp_thousands_separator_no;
    }

    private void preparePrecisionPreference() {
@ -227,7 +261,7 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
        });
    }

-    private void prepareModePreference() {
+    private void prepareMode() {
        final ListPreference mode = (ListPreference) preferenceManager.findPreference(Preferences.Gui.mode.getKey());
        mode.setSummary(Preferences.Gui.getMode(preferences).name);
        mode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@ -239,7 +273,7 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
        });
    }

-    private void prepareAnglesPreference() {
+    private void prepareAngles() {
        final ListPreference angles = (ListPreference) preferenceManager.findPreference(Engine.Preferences.angleUnit.getKey());
        angles.setSummary(angleUnitName(Engine.Preferences.angleUnit.getPreference(preferences)));
        angles.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@ -251,7 +285,7 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc
        });
    }

-    private void prepareRadixPreference() {
+    private void prepareRadix() {
        final ListPreference radix = (ListPreference) preferenceManager.findPreference(Engine.Preferences.numeralBase.getKey());
        radix.setSummary(numeralBaseName(Engine.Preferences.numeralBase.getPreference(preferences)));
        radix.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@ -330,6 +364,16 @@ public class PreferencesFragment extends org.solovyev.android.material.preferenc

    @Override
    public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
+        if (Preferences.Onscreen.showAppIcon.isSameKey(key)) {
+            updateFloatingCalculatorPreferences();
+        }
+    }
+
+    private void updateFloatingCalculatorPreferences() {
+        final Preference theme = findPreference(Preferences.Onscreen.theme.getKey());
+        if (theme != null) {
+            theme.setEnabled(Preferences.Onscreen.showAppIcon.getPreference(preferences));
+        }
    }

    @Subscribe
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@ -17,10 +17,10 @@
                app:showAsAction="never" />
            <item
                android:id="@+id/menu_mode_engineer"
-                android:title="@string/cpp_wizard_mode_engineer" />
+                android:title="@string/cpp_mode_engineer" />
            <item
                android:id="@+id/menu_mode_simple"
-                android:title="@string/cpp_wizard_mode_simple" />
+                android:title="@string/cpp_mode_simple" />
        </menu>
    </item>

@ -39,10 +39,10 @@
                app:showAsAction="never" />
            <item
                android:id="@+id/menu_au_deg"
-                android:title="@string/p_deg" />
+                android:title="@string/cpp_deg" />
            <item
                android:id="@+id/menu_au_rad"
-                android:title="@string/p_rad" />
+                android:title="@string/cpp_rad" />
        </menu>
    </item>

@ -61,13 +61,13 @@
                app:showAsAction="never" />
            <item
                android:id="@+id/menu_nb_bin"
-                android:title="@string/p_bin" />
+                android:title="@string/cpp_bin" />
            <item
                android:id="@+id/menu_nb_dec"
-                android:title="@string/p_dec" />
+                android:title="@string/cpp_dec" />
            <item
                android:id="@+id/menu_nb_hex"
-                android:title="@string/p_hex" />
+                android:title="@string/cpp_hex" />
        </menu>
    </item>

--- a/app/src/main/res/values-ar/text_imported_aosp.xml
+++ b/app/src/main/res/values-ar/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">تبديل</string>
   <string name="cpp_add">إضافة</string>
   <string name="cpp_mode">الوضع</string>
+   <string name="cpp_enable">تمكين</string>
+   <string name="cpp_other">غير ذلك</string>
   <string name="cpp_edit">تعديل</string>
   <string name="cpp_delete">حذف</string>
   <string name="cpp_done">تم</string>
--- a/app/src/main/res/values-ar/text_imported_other1.xml
+++ b/app/src/main/res/values-ar/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">مقدّمة</string>
+   <string name="cpp_prefs_basic">أساسي</string>
+   <string name="cpp_prefs_advanced">خيارات متقدمة</string>
+   <string name="cpp_report_problem">الإبلاغ عن خطأ</string>
+   <string name="cpp_help">تعليمات</string>
+</resources>
--- a/app/src/main/res/values-ar/text_microsoft.xml
+++ b/app/src/main/res/values-ar/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">المظهر</string>
+   <string name="cpp_number_format">تنسيق الأرقام</string>
+   <string name="cpp_system_language">طابقت لغته لغة النظام.</string>
+   <string name="cpp_format">تنسيق بيانات غير معتمد.</string>
+   <string name="cpp_angles">زوايا</string>
+   <string name="cpp_thousands_separator">فاصل اللآلاف</string>
+   <string name="cpp_examples">أمثلة</string>
+</resources>
--- a/app/src/main/res/values-ar/text_strings.xml
+++ b/app/src/main/res/values-ar/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">الآلة الحاسبة++</string>
+    <string name="cpp_app_name">الآلة الحاسبة++</string>
    <string name="c_app_name_on_screen">الآلة الحاسبة++ (نمط النافذة)</string>
    <string name="c_result_copied">تم نسخ النتيجة الى الحافظة!</string>
    <string name="c_vars_and_constants">المتغيرات والثوابت</string>
@ -15,7 +15,7 @@
    <string name="c_calc_science_notation_title">النمط العلمي دائماً</string>
  <string name="c_calc_science_notation_summary">إذا كان الخيار فعال ستظهر النتيجة دائما بالنمط العلمي
 (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">دقة النتيجة</string>
+    <string name="cpp_precision">دقة النتيجة</string>
    <string name="c_save">حفظ</string>
    <string name="removal_confirmation">تأكيد الإزالة</string>
    <string name="c_var_removal_confirmation_question">هل تريد حقاً حذف المتغير \'%s\'؟</string>
@ -31,26 +31,26 @@
    <string name="c_history">السجل</string>
    <string name="c_char_is_not_accepted">المحرف \'%s\' غير مقبول في اسم المتغير!</string>
    <string name="c_calc_angle_units">واحدة الزاوية الحالية</string>
-    <string name="p_deg">درجات</string>
-    <string name="p_rad">راديان</string>
-    <string name="p_grad">غراديان</string>
-    <string name="p_turns">الأدوار</string>
+    <string name="cpp_deg">درجات</string>
+    <string name="cpp_rad">راديان</string>
+    <string name="cpp_grad">غراديان</string>
+    <string name="cpp_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="cpp_dec">عشري</string>
+    <string name="cpp_hex">ستّ عشري</string>
+    <string name="cpp_oct">ثماني</string>
+    <string name="cpp_bin">ثنائي</string>
    <string name="c_calc_theme">السيمة</string>
-    <string name="p_metro_blue_theme">المترو الأزرق</string>
+    <string name="cpp_theme_metro_blue">المترو الأزرق</string>
    <string name="p_metro_green_theme">المترو الأخضر</string>
    <string name="p_metro_purple_theme">المترو الأرجواني</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
    <string name="c_calc_result_precision_summary">دقة قيمة النتيجة (الحسابات كافة تتم بأقصى قدر من الدقة بغض النظر عن قيمة هذا الخيار)</string>
-    <string name="p_grouping_separator_no">بلا فاصل</string>
-    <string name="p_grouping_separator_apostrophe">فاصلة عليا (\')</string>
-    <string name="p_grouping_separator_space">مسافة ( )</string>
+    <string name="cpp_thousands_separator_no">بلا فاصل</string>
+    <string name="cpp_thousands_separator_apostrophe">فاصلة عليا (\')</string>
+    <string name="cpp_thousands_separator_space">مسافة ( )</string>
    <string name="c_calc_grouping_separator">فاصل المجومعات العددية</string>
    <string name="c_calc_grouping_separator_summary">تعيين فاصل المجموعات</string>
    <string name="not_valid_result">النتيجة الحالية غير صالحة!</string>
@ -93,8 +93,8 @@
    <string name="preferred_angle_units_message">واحدة الزوايا الإفتراضية \'%1$s\' تختلف عن الحالية \'%2$s\'. نسيت أن تغيرها مرة أخرى؟</string>
    <string name="close">إغلاق</string>
    <string name="open_onscreen_calculator">أنقر لفتح الآلة الحاسبة في وضع النافذة</string>
-    <string name="prefs_onscreen_title">إعدادات الآلة الحاسبة (في نافذة منفصلة)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">إعدادات الآلة الحاسبة (في نافذة منفصلة)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">إظهار أيقونة منفصلة (يتطلب إعادة التشغيل)</string>
    <string name="prefs_onscreen_show_app_icon_summary">إذا كان الخيار فعال ستظهر الأيقونة الثانية في قائمة التطبيقات</string>
    <string name="cpp_this_change_may_require_reboot">قد يتطلب هذا التغيير إعادة تشغيل</string>
@ -115,5 +115,4 @@
    <string name="cpp_clear_history">إزالة</string>
    <string name="cpp_new_in_version">الجديد في الإصدار %1$s</string>
    <string name="cpp_release_notes_choose_theme">هل تريد محاولة المواضيع المادية الجديدة؟ اختر منهم من القائمة:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-ar/text_wizard.xml
+++ b/app/src/main/res/values-ar/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">رجوع</string>
    <string name="cpp_wizard_start">بدء الدليل</string>
    <string name="cpp_wizard_finish">إنتهى</string>
-    <string name="cpp_wizard_mode_simple">بسيطة</string>
+    <string name="cpp_mode_simple">بسيطة</string>
  <string name="cpp_wizard_mode_simple_description">في النمط البسيط ستتوفر الوظائف الأساسية فقط في الشاشة الرئيسية.
 يتم تقريب النتيجة الى 5 أرقام كحد أقصى, وتستخدم الدرجات كوحدات إفتراضية للزاوية.</string>
-    <string name="cpp_wizard_mode_engineer">هندسية</string>
+    <string name="cpp_mode_engineer">هندسية</string>
  <string name="cpp_wizard_mode_engineer_description">في النمط الهندسي ستتوفر وظائف خاصة على الشاشة الرئيسية.
 النتيجة لا يتم تقريبها و تظهر بصيغة هندسية، يستخدم الراديان كواحدة إفتراضية للزاوية.</string>
    <string name="cpp_restart_wizard">بدء جولة الدليل</string>
--- a/app/src/main/res/values-cs/text_imported_aosp.xml
+++ b/app/src/main/res/values-cs/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Přepnout</string>
   <string name="cpp_add">Přidat</string>
   <string name="cpp_mode">Režim určování polohy</string>
+   <string name="cpp_enable">Aktivovat</string>
+   <string name="cpp_other">Jiné</string>
   <string name="cpp_edit">Upravit</string>
   <string name="cpp_delete">Smazat</string>
   <string name="cpp_done">Hotovo</string>
--- a/app/src/main/res/values-cs/text_imported_other1.xml
+++ b/app/src/main/res/values-cs/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Úvodem</string>
+   <string name="cpp_prefs_basic">Základní</string>
+   <string name="cpp_prefs_advanced">Rozšířené</string>
+   <string name="cpp_report_problem">Nahlásit problém</string>
+   <string name="cpp_help">Nápověda</string>
+</resources>
--- a/app/src/main/res/values-cs/text_microsoft.xml
+++ b/app/src/main/res/values-cs/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Vzhled</string>
+   <string name="cpp_number_format">Formát čísla</string>
+   <string name="cpp_system_language">Jazyk operačního systému</string>
+   <string name="cpp_format">Formát</string>
+   <string name="cpp_angles">Úhly</string>
+   <string name="cpp_thousands_separator">Oddělovač tisíců</string>
+   <string name="cpp_examples">Příklady</string>
+</resources>
--- a/app/src/main/res/values-cs/text_strings.xml
+++ b/app/src/main/res/values-cs/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Kalkulačka ++ (Režim okna)</string>
    <string name="c_result_copied">Výsledek byl zkopírován do schránky!</string>
    <string name="c_vars_and_constants">Proměnné a Konstanty</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Přepíná zaokrouhlení výsledku</string>
    <string name="c_calc_science_notation_title">Vždy vědecká notace</string>
    <string name="c_calc_science_notation_summary">Je-li zapnuto, používá se pouze vědecký zápis výstupu (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Přesnost výsledku</string>
+    <string name="cpp_precision">Přesnost výsledku</string>
    <string name="c_save">Uložit</string>
    <string name="removal_confirmation">Potvrzení odebrání</string>
    <string name="c_var_removal_confirmation_question">Opravdu chcete odstranit proměnnou \'%s\'?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radiánů</string>
-    <string name="p_grad">Gradiánů</string>
-    <string name="p_turns">Cykly</string>
+    <string name="cpp_deg">Stupňů</string>
+    <string name="cpp_rad">Radiánů</string>
+    <string name="cpp_grad">Gradiánů</string>
+    <string name="cpp_turns">Cykly</string>
    <string name="c_angle_units_summary">Definuje jednotky pro úhly používaných při výpočtech</string>
    <string name="c_calc_numeral_bases">Aktuální číselná soustava</string>
    <string name="c_numeral_bases_summary">Definuje číselnou soustavu která má být použita ve výpočtech</string>
-    <string name="p_dec">Desítková</string>
-    <string name="p_hex">Hexadecimální</string>
-    <string name="p_oct">Osmičková</string>
-    <string name="p_bin">Binární</string>
+    <string name="cpp_dec">Desítková</string>
+    <string name="cpp_hex">Hexadecimální</string>
+    <string name="cpp_oct">Osmičková</string>
+    <string name="cpp_bin">Binární</string>
    <string name="c_calc_theme">Vzhled</string>
-    <string name="p_metro_blue_theme">Metro Modrá</string>
+    <string name="cpp_theme_metro_blue">Metro Modrá</string>
    <string name="p_metro_green_theme">Metro Zelená</string>
    <string name="p_metro_purple_theme">Metro Fialová</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">Žádný oddělovač skupiny čísel</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrof (\')</string>
+    <string name="cpp_thousands_separator_space">Mezera ( )</string>
    <string name="c_calc_grouping_separator">Oddělovač skupiny čísel</string>
    <string name="c_calc_grouping_separator_summary">Nastavit oddělovač skupiny čísel</string>
    <string name="not_valid_result">Aktuální výsledek není platný!</string>
@ -92,8 +92,8 @@
    <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="open_onscreen_calculator">Kliknutím spustíte kalkulačku v režimu okna</string>
-    <string name="prefs_onscreen_title">Nastavení kalkulačky (v samostatném okně)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Nastavení kalkulačky (v samostatném okně)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Zobrazit samostatnou ikonu (vyžaduje restartování)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Je-li zapnuta druhá ikona  bude zobrazena v seznamu aplikací</string>
    <string name="cpp_this_change_may_require_reboot">Tato změna může vyžadovat restartování systému</string>
@ -113,5 +113,4 @@ Platební informace jsou uloženy na serveru společně s vaším účtem.\n\n K
    <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>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-cs/text_wizard.xml
+++ b/app/src/main/res/values-cs/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Zpět</string>
    <string name="cpp_wizard_start">Spustit průvodce</string>
    <string name="cpp_wizard_finish">Dokončeno</string>
-    <string name="cpp_wizard_mode_simple">Jednoduché</string>
+    <string name="cpp_mode_simple">Jednoduché</string>
    <string name="cpp_wizard_mode_simple_description">V jednoduchém režimu budou z hlavní obrazovky k dispozici pouze základní funkce.   Výsledek se zaokrouhlí na 5 číslic, stupně se používají jako výchozí jednotka úhle.</string>
-    <string name="cpp_wizard_mode_engineer">Vědec</string>
+    <string name="cpp_mode_engineer">Vědec</string>
    <string name="cpp_wizard_mode_engineer_description">V inženýrském režimu se v hlavním okně objeví speciální funkce. Výsledek není zaokrouhlen a je uveden v inženýrskym zápisu, radiány se používají jako výchozí jednotka úhlu.</string>
    <string name="cpp_restart_wizard">Spustit průvodce</string>
    <string name="cpp_wizard_dragbutton_action_end">Vynikající! Klepnutím na tlačítko můžete zopakovat ještě jednou</string>
--- a/app/src/main/res/values-de/text_imported_aosp.xml
+++ b/app/src/main/res/values-de/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Wechseln</string>
   <string name="cpp_add">Hinzufügen</string>
   <string name="cpp_mode">Modus</string>
+   <string name="cpp_enable">Aktivieren</string>
+   <string name="cpp_other">Andere</string>
   <string name="cpp_edit">Bearbeiten</string>
   <string name="cpp_delete">Löschen</string>
   <string name="cpp_done">Fertig</string>
--- a/app/src/main/res/values-de/text_imported_other1.xml
+++ b/app/src/main/res/values-de/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Einführung</string>
+   <string name="cpp_prefs_basic">Grundeinstellungen</string>
+   <string name="cpp_prefs_advanced">Erweitert</string>
+   <string name="cpp_report_problem">Ein Problem melden</string>
+   <string name="cpp_help">Hilfe</string>
+</resources>
--- a/app/src/main/res/values-de/text_microsoft.xml
+++ b/app/src/main/res/values-de/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Darstellung</string>
+   <string name="cpp_number_format">Zahlenformat</string>
+   <string name="cpp_system_language">Systemsprache</string>
+   <string name="cpp_format">Format</string>
+   <string name="cpp_angles">Winkel</string>
+   <string name="cpp_thousands_separator">Tausender-Trennzeichen</string>
+   <string name="cpp_examples">Beispiele</string>
+</resources>
--- a/app/src/main/res/values-de/text_strings.xml
+++ b/app/src/main/res/values-de/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (Fenstermodus)</string>
    <string name="c_result_copied">Ergebnis wurde in die Zwischenablage kopiert!</string>
    <string name="c_vars_and_constants">Variablen und Konstanten</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Ergebnis runden ein-/ausschalten</string>
    <string name="c_calc_science_notation_title">Immer wissenschaftliche Notation</string>
    <string name="c_calc_science_notation_summary">Wenn eingeschaltet, zwingend wissenschaftliche Notation für Ergebnisse verwenden (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Genauigkeit des Ergebnisses</string>
+    <string name="cpp_precision">Genauigkeit des Ergebnisses</string>
    <string name="c_save">Speichern</string>
    <string name="removal_confirmation">Löschbestätigung</string>
    <string name="c_var_removal_confirmation_question">Möchten Sie die Variable \'%s\' wirklich löschen?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Bogenmaß</string>
-    <string name="p_grad">Gon (Neugrad)</string>
-    <string name="p_turns">Vollwinkel</string>
+    <string name="cpp_deg">Grad</string>
+    <string name="cpp_rad">Bogenmaß</string>
+    <string name="cpp_grad">Gon (Neugrad)</string>
+    <string name="cpp_turns">Vollwinkel</string>
    <string name="c_angle_units_summary">Definiert die für Berechnungen genutze Winkeleinheit</string>
    <string name="c_calc_numeral_bases">Aktuelles Zahlensystem</string>
    <string name="c_numeral_bases_summary">Definiert das Zahlensystem, welches in den Berechnungen verwendet wird</string>
-    <string name="p_dec">Dezimal</string>
-    <string name="p_hex">Hexadezimal</string>
-    <string name="p_oct">Oktal</string>
-    <string name="p_bin">Binär</string>
+    <string name="cpp_dec">Dezimal</string>
+    <string name="cpp_hex">Hexadezimal</string>
+    <string name="cpp_oct">Oktal</string>
+    <string name="cpp_bin">Binär</string>
    <string name="c_calc_theme">Stil</string>
-    <string name="p_metro_blue_theme">Metro Blau</string>
+    <string name="cpp_theme_metro_blue">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_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="p_grouping_separator_no">Kein 1000er-Trennzeichen</string>
-    <string name="p_grouping_separator_apostrophe">Apostroph (\')</string>
-    <string name="p_grouping_separator_space">Leerzeichen ( )</string>
+    <string name="cpp_thousands_separator_no">Kein 1000er-Trennzeichen</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostroph (\')</string>
+    <string name="cpp_thousands_separator_space">Leerzeichen ( )</string>
    <string name="c_calc_grouping_separator">1000er-Trennzeichen</string>
    <string name="c_calc_grouping_separator_summary">1000er-Trennzeichen setzen</string>
    <string name="not_valid_result">Aktuelles Ergebnis ist ungültig!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Die Standard Winkeleinheiten \'%1$s unterscheidet sich von der aktuellen \'%2$s\'. Haben Sie vergessen es zurückzusetzen?</string>
    <string name="close">Schließen</string>
    <string name="open_onscreen_calculator">Klicken Sie hier, um den Rechner im Fenstermodus zu öffnen</string>
-    <string name="prefs_onscreen_title">Fenstermodus-Einstellungen</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Fenstermodus-Einstellungen</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Seperates Symbol anzeigen (Neustart erforderlich)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Wenn aktiviert wird das zweite Symbol in der Anwendungsliste angezeigt</string>
    <string name="cpp_this_change_may_require_reboot">Diese Änderung kann einen Neustart erfordern</string>
@ -114,5 +114,4 @@ Klicken Sie auf \"Weiter\" und Sie werden zu Google Play weitergeleitet, wo Sie
    <string name="cpp_clear_history">Löschen</string>
    <string name="cpp_new_in_version">Neu in Version %1$s</string>
    <string name="cpp_release_notes_choose_theme">Wollen Sie das neue Material-Design ausprobieren? Wählen sie aus der Liste:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-de/text_wizard.xml
+++ b/app/src/main/res/values-de/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Zurück</string>
    <string name="cpp_wizard_start">Wizard starten</string>
    <string name="cpp_wizard_finish">Fertig</string>
-    <string name="cpp_wizard_mode_simple">Einfach</string>
+    <string name="cpp_mode_simple">Einfach</string>
  <string name="cpp_wizard_mode_simple_description">Im einfachen Modus werden nur grundlegende Funktionen vom Hauptbildschirm verfügbar sein.
 Das Ergebnis wird auf 5 Nachkommastellen gerundet. Grad wird als Winkeleinheit verwendet.</string>
-    <string name="cpp_wizard_mode_engineer">Ingenieur</string>
+    <string name="cpp_mode_engineer">Ingenieur</string>
  <string name="cpp_wizard_mode_engineer_description">In Ingenieur-Modus werden spezielle Funktionen auf dem Hauptbildschirm verwendet.
 Ergebnisse werden nicht gerundet und es wird die wissenschaftliche Notation verwendet. Bogenmaß wird als Standardwinkeleinheit verwendet.</string>
    <string name="cpp_restart_wizard">Assistenten starten</string>
--- a/app/src/main/res/values-es/text_imported_aosp.xml
+++ b/app/src/main/res/values-es/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Cambiar</string>
   <string name="cpp_add">Añadir</string>
   <string name="cpp_mode">Modo</string>
+   <string name="cpp_enable">Habilitar</string>
+   <string name="cpp_other">Otros</string>
   <string name="cpp_edit">Editar</string>
   <string name="cpp_delete">Eliminar</string>
   <string name="cpp_done">Listo</string>
@ -25,7 +27,7 @@
   <string name="cpp_text_copied">Texto copiado</string>
   <string name="cpp_name">Nombre</string>
   <string name="cpp_settings">Ajustes</string>
-   <string name="cpp_nan">No es un número</string>
+   <string name="cpp_nan">No es número</string>
   <string name="cpp_error">Error</string>
   <string name="cpp_copy">Copiar</string>
 </resources>
--- a/app/src/main/res/values-es/text_imported_other1.xml
+++ b/app/src/main/res/values-es/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Introducción</string>
+   <string name="cpp_prefs_basic">Básico</string>
+   <string name="cpp_prefs_advanced">Avanzado</string>
+   <string name="cpp_report_problem">Reporta un problema</string>
+   <string name="cpp_help">Ayuda</string>
+</resources>
--- a/app/src/main/res/values-es/text_microsoft.xml
+++ b/app/src/main/res/values-es/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Apariencia</string>
+   <string name="cpp_number_format">Formato de número</string>
+   <string name="cpp_system_language">Idioma del sistema</string>
+   <string name="cpp_format">Formato</string>
+   <string name="cpp_angles">Ángulos</string>
+   <string name="cpp_thousands_separator">Separador de millares</string>
+   <string name="cpp_examples">Ejemplos</string>
+</resources>
--- a/app/src/main/res/values-es/text_strings.xml
+++ b/app/src/main/res/values-es/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculadora++</string>
+    <string name="cpp_app_name">Calculadora++</string>
    <string name="c_app_name_on_screen">Calculadora++ (Modo ventana)</string>
    <string name="c_result_copied">¡El resultado se ha copiado en el portapapeles!</string>
    <string name="c_vars_and_constants">Variables y Constantes</string>
@ -15,7 +15,7 @@
    <string name="c_calc_science_notation_title">Notación científica permanente</string>
  <string name="c_calc_science_notation_summary">Si está activado, se fuerza el uso de la notación científica para mostrar el resultado.
 (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Precisión del resultado</string>
+    <string name="cpp_precision">Precisión del resultado</string>
    <string name="c_save">Grabar</string>
    <string name="removal_confirmation">Confirmación de Borrado</string>
    <string name="c_var_removal_confirmation_question">¿Realmente desea borrar la variable \'%s\'?</string>
@ -32,27 +32,27 @@
    <string name="c_history">Historial</string>
    <string name="c_char_is_not_accepted">El carácter \'%s\' no es aceptado como variable!</string>
    <string name="c_calc_angle_units">Unidades de Ángulos</string>
-    <string name="p_deg">Grados</string>
-    <string name="p_rad">Radianes</string>
-    <string name="p_grad">Gradianes</string>
-    <string name="p_turns">Vueltas</string>
+    <string name="cpp_deg">Grados</string>
+    <string name="cpp_rad">Radianes</string>
+    <string name="cpp_grad">Gradianes</string>
+    <string name="cpp_turns">Vueltas</string>
    <string name="c_angle_units_summary">Define la unidad para ángulos predeterminada.</string>
    <string name="c_calc_numeral_bases">Sistemas de numeración</string>
  <string name="c_numeral_bases_summary">Define el sistema de numeración por defecto para todos los números de entrada
 	</string>
-    <string name="p_dec">Decimal</string>
-    <string name="p_hex">Hexadecimal</string>
-    <string name="p_oct">Octal</string>
-    <string name="p_bin">Binario</string>
+    <string name="cpp_dec">Decimal</string>
+    <string name="cpp_hex">Hexadecimal</string>
+    <string name="cpp_oct">Octal</string>
+    <string name="cpp_bin">Binario</string>
    <string name="c_calc_theme">Tema</string>
-    <string name="p_metro_blue_theme">Metro Azul</string>
+    <string name="cpp_theme_metro_blue">Metro Azul</string>
    <string name="p_metro_green_theme">Metro Verde</string>
    <string name="p_metro_purple_theme">Metro Morado</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">No usar separador de Grupos</string>
+    <string name="cpp_thousands_separator_apostrophe">Apóstrofe (\')</string>
+    <string name="cpp_thousands_separator_space">Espacio ( )</string>
    <string name="c_calc_grouping_separator">Separador de Grupos</string>
    <string name="c_calc_grouping_separator_summary">Establecer el separador de Grupos</string>
    <string name="not_valid_result">El resultado actual no es válido!</string>
@ -96,8 +96,8 @@
 	</string>
    <string name="close">Cerrar</string>
    <string name="open_onscreen_calculator">Haga clic para abrir la calculadora en modo ventana</string>
-    <string name="prefs_onscreen_title">Ajustes de la calculadora (en ventana separada)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Ajustes de la calculadora (en ventana separada)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar icono separado (requiere reiniciar)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Si está activado, aparecerá un segundo icono en la lista de aplicaciones</string>
    <string name="cpp_this_change_may_require_reboot">Después de realizar este cambio, es posible que tenga que reiniciar</string>
@ -117,5 +117,4 @@
    <string name="cpp_new_in_version">Nuevo en versión %1$s</string>
  <string name="cpp_release_notes_choose_theme">¿Desea probar nuevos temas Material?
 Escojalos de la lista:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-es/text_wizard.xml
+++ b/app/src/main/res/values-es/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Atrás</string>
    <string name="cpp_wizard_start">Iniciar el asistente</string>
    <string name="cpp_wizard_finish">Terminado</string>
-    <string name="cpp_wizard_mode_simple">Sencillo</string>
+    <string name="cpp_mode_simple">Sencillo</string>
  <string name="cpp_wizard_mode_simple_description">En el modo sencillo sólo estará disponible la funcionalidad básica desde la pantalla principal.
 El resultado se redondea hasta 5 dígitos, y los grados son la unidad de ángulo predeterminada.</string>
-    <string name="cpp_wizard_mode_engineer">Científico</string>
+    <string name="cpp_mode_engineer">Científico</string>
  <string name="cpp_wizard_mode_engineer_description">En el modo científico todas las funcionalidades especiales están disponibles desde la pantalla principal.
 El resultado no se redondea, y los radianes son la unidad de ángulo predeterminada.</string>
    <string name="cpp_restart_wizard">Iniciar el asistente</string>
--- a/app/src/main/res/values-fi/text_imported_aosp.xml
+++ b/app/src/main/res/values-fi/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Vaihda</string>
   <string name="cpp_add">Lisää</string>
   <string name="cpp_mode">Tila</string>
+   <string name="cpp_enable">Ota käyttöön</string>
+   <string name="cpp_other">Muu</string>
   <string name="cpp_edit">Muokkaa</string>
   <string name="cpp_delete">Poista</string>
   <string name="cpp_done">Valmis</string>
--- a/app/src/main/res/values-fi/text_imported_other1.xml
+++ b/app/src/main/res/values-fi/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Esittely</string>
+   <string name="cpp_prefs_basic">Perusasetukset</string>
+   <string name="cpp_prefs_advanced">Lisäasetukset</string>
+   <string name="cpp_report_problem">Ilmoita ongelmasta</string>
+   <string name="cpp_help">Ohje</string>
+</resources>
--- a/app/src/main/res/values-fi/text_microsoft.xml
+++ b/app/src/main/res/values-fi/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Ulkoasu</string>
+   <string name="cpp_number_format">Numeromuoto</string>
+   <string name="cpp_system_language">Sen kieli vastaa järjestelmän kieltä.</string>
+   <string name="cpp_format">Tietomuotoa ei tueta.</string>
+   <string name="cpp_angles">Kulmat</string>
+   <string name="cpp_thousands_separator">Tuhaterotin</string>
+   <string name="cpp_examples">Esimerkkejä</string>
+</resources>
--- a/app/src/main/res/values-fi/text_strings.xml
+++ b/app/src/main/res/values-fi/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Laskin++</string>
+    <string name="cpp_app_name">Laskin++</string>
    <string name="c_app_name_on_screen">Laskin++ (ikkuna-tilassa)</string>
    <string name="c_result_copied">Tulos on kopioitu Leikepöydälle!</string>
    <string name="c_vars_and_constants">Muuttujien ja vakioiden</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Vaihtaa Pyöristyksen tuloksena</string>
    <string name="c_calc_science_notation_title">Aina eksponenttimuodossa</string>
    <string name="c_calc_science_notation_summary">Jos käytössä voimat käyttää tieteellistä merkintätapaa tuotoksen (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Tarkka tulos</string>
+    <string name="cpp_precision">Tarkka tulos</string>
    <string name="c_save">Tallenna</string>
    <string name="removal_confirmation">Poistamisvahvistus</string>
    <string name="c_var_removal_confirmation_question">Haluatko todella poistaa %s muuttujan?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radiaanit</string>
-    <string name="p_grad">Gradians</string>
-    <string name="p_turns">Kääntyy</string>
+    <string name="cpp_deg">Astetta</string>
+    <string name="cpp_rad">Radiaanit</string>
+    <string name="cpp_grad">Gradians</string>
+    <string name="cpp_turns">Kääntyy</string>
    <string name="c_angle_units_summary">Määrittää yksiköiden kulmat voidaan käyttää laskutoimituksissa</string>
    <string name="c_calc_numeral_bases">Nykyinen lukujärjestelmä</string>
    <string name="c_numeral_bases_summary">Määrittää numeron järjestelmä käyttää laskutoimituksissa</string>
-    <string name="p_dec">Desimaali</string>
-    <string name="p_hex">Heksadesimaali</string>
-    <string name="p_oct">Oktaaliluvun muuntaminen</string>
-    <string name="p_bin">Binary</string>
+    <string name="cpp_dec">Desimaali</string>
+    <string name="cpp_hex">Heksadesimaali</string>
+    <string name="cpp_oct">Oktaaliluvun muuntaminen</string>
+    <string name="cpp_bin">Binary</string>
    <string name="c_calc_theme">Teema</string>
-    <string name="p_metro_blue_theme">Metron Sininen</string>
+    <string name="cpp_theme_metro_blue">Metron Sininen</string>
    <string name="p_metro_green_theme">Metron vihreä</string>
    <string name="p_metro_purple_theme">Metro violetti</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">Ilman ryhmittelyä erotinta</string>
+    <string name="cpp_thousands_separator_apostrophe">Heittomerkki (\')</string>
+    <string name="cpp_thousands_separator_space">Väli ( )</string>
    <string name="c_calc_grouping_separator">Ryhmittely erotin</string>
    <string name="c_calc_grouping_separator_summary">Määrittää ryhmittelyn erotin</string>
    <string name="not_valid_result">Nykyinen tulos ei kelpaa!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Oletus kulma yksiköt %1$s\"eroaa nykyisestä %2$s\". Unohtanut vaihtaa takaisin?  </string>
    <string name="close">Sulje</string>
    <string name="open_onscreen_calculator">Avaa Laskin kotona Akkuna moodi</string>
-    <string name="prefs_onscreen_title">Laskin (uudessa ikkunassa) asetukset</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Laskin (uudessa ikkunassa) asetukset</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Näytä erillinen kuvake (vaatii uudelleenkäynnistyksen)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Jos päällä toinen kuvake näkyvät sovellusten luettelo  </string>
    <string name="cpp_this_change_may_require_reboot">Tämä muutos saattaa edellyttää uudelleenkäynnistyksen</string>
@ -112,5 +112,4 @@
    <string name="cpp_clear_history">Tyhjennä</string>
    <string name="cpp_new_in_version">Uutta versiossa %1$s</string>
    <string name="cpp_release_notes_choose_theme">Haluatko kokeilla uusia materiaaliteemoja? Valitse luettelosta:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-fi/text_wizard.xml
+++ b/app/src/main/res/values-fi/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Takaisin</string>
    <string name="cpp_wizard_start">Aloita ohjattu asennus</string>
    <string name="cpp_wizard_finish">Valmis</string>
-    <string name="cpp_wizard_mode_simple">Yksinkertaistettu</string>
+    <string name="cpp_mode_simple">Yksinkertaistettu</string>
  <string name="cpp_wizard_mode_simple_description">Yksinkertaistetussa tilassa vain olennainen toiminnallisuus on saatavilla aloitusnäkymässä.
 Tulokset pyöristetään ylöspäin viiteen desimaaliin ja kulmienn oletusyksikkönä käytetään asteita.</string>
-    <string name="cpp_wizard_mode_engineer">Insinööri</string>
+    <string name="cpp_mode_engineer">Insinööri</string>
  <string name="cpp_wizard_mode_engineer_description">Insinööritilassa erikoisfunktiot ovat käytettävissä päänäkymästä.
 Vastauksia ei pyöristetä ja ne näytetään 10-potenssimuodossa, kulman oletusyksikkö on radiaani.</string>
    <string name="cpp_restart_wizard">Aloita ohjattu asennus</string>
--- a/app/src/main/res/values-fr/text_imported_aosp.xml
+++ b/app/src/main/res/values-fr/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Changer</string>
   <string name="cpp_add">Ajouter</string>
   <string name="cpp_mode">Mode</string>
+   <string name="cpp_enable">Activer</string>
+   <string name="cpp_other">Autre</string>
   <string name="cpp_edit">Modifier</string>
   <string name="cpp_delete">Supprimer</string>
   <string name="cpp_done">OK</string>
--- a/app/src/main/res/values-fr/text_imported_other1.xml
+++ b/app/src/main/res/values-fr/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Introduction</string>
+   <string name="cpp_prefs_basic">Basique</string>
+   <string name="cpp_prefs_advanced">Avancé</string>
+   <string name="cpp_report_problem">Signaler un problème</string>
+   <string name="cpp_help">Aide</string>
+</resources>
--- a/app/src/main/res/values-fr/text_microsoft.xml
+++ b/app/src/main/res/values-fr/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Apparence</string>
+   <string name="cpp_number_format">Format de nombre</string>
+   <string name="cpp_system_language">Langue du système</string>
+   <string name="cpp_format">Format</string>
+   <string name="cpp_angles">Angles</string>
+   <string name="cpp_thousands_separator">Séparateur de milliers</string>
+   <string name="cpp_examples">Exemples</string>
+</resources>
--- a/app/src/main/res/values-fr/text_strings.xml
+++ b/app/src/main/res/values-fr/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (mode fenêtre)</string>
    <string name="c_result_copied">Le résultat a été copié dans le presse-papiers !</string>
    <string name="c_vars_and_constants">Variables et constantes</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Cochez pour arrondir le résultat</string>
    <string name="c_calc_science_notation_title">Toujours en notation scientifique</string>
    <string name="c_calc_science_notation_summary">Si coché force la sortie en notation scientifique (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Précision du résultat</string>
+    <string name="cpp_precision">Précision du résultat</string>
    <string name="c_save">Enregistrer</string>
    <string name="removal_confirmation">Confirmation de suppression</string>
    <string name="c_var_removal_confirmation_question">Voulez-vous vraiment supprimer la variable « %s » ?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radians</string>
-    <string name="p_grad">Grades</string>
-    <string name="p_turns">Tour</string>
+    <string name="cpp_deg">Degrés</string>
+    <string name="cpp_rad">Radians</string>
+    <string name="cpp_grad">Grades</string>
+    <string name="cpp_turns">Tour</string>
    <string name="c_angle_units_summary">Définit l\'unité d\'angle à utiliser dans les calculs</string>
    <string name="c_calc_numeral_bases">Système numérique actuel</string>
    <string name="c_numeral_bases_summary">Définit le système de numération à utiliser dans les calculs</string>
-    <string name="p_dec">Décimal</string>
-    <string name="p_hex">Hexadécimal</string>
-    <string name="p_oct">Octal</string>
-    <string name="p_bin">Binaire</string>
+    <string name="cpp_dec">Décimal</string>
+    <string name="cpp_hex">Hexadécimal</string>
+    <string name="cpp_oct">Octal</string>
+    <string name="cpp_bin">Binaire</string>
    <string name="c_calc_theme">Thème</string>
-    <string name="p_metro_blue_theme">Métro bleu</string>
+    <string name="cpp_theme_metro_blue">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_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">Pas de séparateur de classe</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrophe (\')</string>
+    <string name="cpp_thousands_separator_space">Espace ( )</string>
    <string name="c_calc_grouping_separator">Séparateur de classe</string>
    <string name="c_calc_grouping_separator_summary">Configure les éléments de séparation</string>
    <string name="not_valid_result">Le résultat actuel n\'est pas valide !</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">L\'unité d\'angle par défaut \'%1$s\' est différent de l\'actuel \'%2$s\'. Avez vous oublié de le remettre ?</string>
    <string name="close">Fermer</string>
    <string name="open_onscreen_calculator">Cliquez pour ouvrir la calculatrice en mode fenêtré</string>
-    <string name="prefs_onscreen_title">Paramètres de la calculatrice (dans une fenêtre séparée)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Paramètres de la calculatrice (dans une fenêtre séparée)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Afficher l\'icône séparée (nécessite un redémarrage)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Si coché, la seconde icône s\'affichera dans la liste des applications</string>
    <string name="cpp_this_change_may_require_reboot">Cette modification peut nécessiter le redémarrage</string>
@ -115,5 +115,4 @@ En cliquant sur le bouton \'Continuer\' vous serez redirigés vers l\'applicatio
    <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-en dans la liste :</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-fr/text_wizard.xml
+++ b/app/src/main/res/values-fr/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Retour</string>
    <string name="cpp_wizard_start">Commencer l\'assistant</string>
    <string name="cpp_wizard_finish">Fini</string>
-    <string name="cpp_wizard_mode_simple">Simple</string>
+    <string name="cpp_mode_simple">Simple</string>
  <string name="cpp_wizard_mode_simple_description">En mode simplifié, seules les fonctionnalités de base seront disponibles depuis l\'écran principal. 
 Le résultat est arrondi à 5 chiffres après la virgule et le degré est l\'unité de mesure d\'angle par défaut.</string>
-    <string name="cpp_wizard_mode_engineer">Scientifique</string>
+    <string name="cpp_mode_engineer">Scientifique</string>
  <string name="cpp_wizard_mode_engineer_description">En mode scientifique, les fonctionnalités avancées sont accessibles depuis l\'écran principal.
 Le résultat n\'est pas arrondi et est affiché en notation scientifique, le radian est l\'unité d\'angle par défaut.</string>
    <string name="cpp_restart_wizard">Commencer l\'assistant</string>
--- a/app/src/main/res/values-it/text_imported_aosp.xml
+++ b/app/src/main/res/values-it/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Cambia</string>
   <string name="cpp_add">Aggiungi</string>
   <string name="cpp_mode">Modalità</string>
+   <string name="cpp_enable">Attiva</string>
+   <string name="cpp_other">Altro</string>
   <string name="cpp_edit">Modifica</string>
   <string name="cpp_delete">Elimina</string>
   <string name="cpp_done">Salva</string>
@ -25,7 +27,7 @@
   <string name="cpp_text_copied">Testo copiato</string>
   <string name="cpp_name">Nome</string>
   <string name="cpp_settings">Impostazioni</string>
-   <string name="cpp_nan">Non è un numero</string>
+   <string name="cpp_nan">Non un numero</string>
   <string name="cpp_error">Errore</string>
   <string name="cpp_copy">Copia</string>
 </resources>
--- a/app/src/main/res/values-it/text_imported_other1.xml
+++ b/app/src/main/res/values-it/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Introduzione</string>
+   <string name="cpp_prefs_basic">Di base</string>
+   <string name="cpp_prefs_advanced">Avanzate</string>
+   <string name="cpp_report_problem">Segnala un problema</string>
+   <string name="cpp_help">Guida</string>
+</resources>
--- a/app/src/main/res/values-it/text_microsoft.xml
+++ b/app/src/main/res/values-it/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Aspetto</string>
+   <string name="cpp_number_format">Formato numero</string>
+   <string name="cpp_system_language">Lingua di sistema</string>
+   <string name="cpp_format">Formato</string>
+   <string name="cpp_angles">Angoli</string>
+   <string name="cpp_thousands_separator">Separatore migliaia</string>
+   <string name="cpp_examples">Esempi</string>
+</resources>
--- a/app/src/main/res/values-it/text_strings.xml
+++ b/app/src/main/res/values-it/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calcolatrice++</string>
+    <string name="cpp_app_name">Calcolatrice++</string>
    <string name="c_app_name_on_screen">Calcolatrice++ (Modalità finestra)</string>
    <string name="c_result_copied">Il risultato è stato copiato negli appunti!</string>
    <string name="c_vars_and_constants">Variabili e costanti</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Attiva/disattiva arrotondamento dei risultati</string>
    <string name="c_calc_science_notation_title">Sempre la notazione scientifica</string>
    <string name="c_calc_science_notation_summary">Se attivo, forza ad usare solo la notazione scientifica di output (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Precisione del risultato</string>
+    <string name="cpp_precision">Precisione del risultato</string>
    <string name="c_save">Salva</string>
    <string name="removal_confirmation">Conferma rimozione</string>
    <string name="c_var_removal_confirmation_question">Vuoi davvero cancellare la variabile \'%s\'?</string>
@ -32,29 +32,29 @@
    <string name="c_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>
-    <string name="p_rad">Radianti</string>
-    <string name="p_grad">Gradianti</string>
-    <string name="p_turns">Accende</string>
+    <string name="cpp_deg">Gradi</string>
+    <string name="cpp_rad">Radianti</string>
+    <string name="cpp_grad">Gradianti</string>
+    <string name="cpp_turns">Accende</string>
    <string name="c_angle_units_summary">Definisci l\'unità di misura predefinita per gli angoli.</string>
    <string name="c_calc_numeral_bases">Numerale sistemi</string>
  <string name="c_numeral_bases_summary">Definisce il sistema numerale di default per tutti i numeri di ingresso.
 	</string>
-    <string name="p_dec">Decimale</string>
-    <string name="p_hex">Esadecimale</string>
-    <string name="p_oct">Ottale</string>
-    <string name="p_bin">Binario</string>
+    <string name="cpp_dec">Decimale</string>
+    <string name="cpp_hex">Esadecimale</string>
+    <string name="cpp_oct">Ottale</string>
+    <string name="cpp_bin">Binario</string>
    <string name="c_calc_theme">Tema</string>
-    <string name="p_metro_blue_theme">Metro Blue</string>
+    <string name="cpp_theme_metro_blue">Metro Blue</string>
    <string name="p_metro_green_theme">Metro Green</string>
    <string name="p_metro_purple_theme">Metro Purple</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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>
-    <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>
+    <string name="cpp_thousands_separator_no">Nessun separatore</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrofo (\')</string>
+    <string name="cpp_thousands_separator_space">Spazio ( )</string>
    <string name="c_calc_grouping_separator">Separatore raggruppamento</string>
    <string name="c_calc_grouping_separator_summary">Imposta separatore raggruppamento</string>
    <string name="not_valid_result">Risultato attuale non valido!</string>
@ -97,8 +97,8 @@
    <string name="preferred_angle_units_message">Unita di misura predefinita per gli angoli \'%1$s\' differisce da quella attuale \'%2$s\'. Dimenticato di cambiarla?</string>
    <string name="close">Chiudi</string>
    <string name="open_onscreen_calculator">Clicca per aprire la calcolatrice in modalità finestra</string>
-    <string name="prefs_onscreen_title">Impostazioni Calculator (in finestra separata)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Impostazioni Calculator (in finestra separata)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Visualizza icona separata (richiede riavvio)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se selezionato, la seconda icona apparirà nella lista delle applicazioni</string>
    <string name="cpp_this_change_may_require_reboot">Questo cambiamento potrebbe richiedere il riavvio</string>
@ -119,5 +119,4 @@ premendo \'continua\' sarai indirizzato all\'applicazione Google play per effett
    <string name="cpp_clear_history">Svuota</string>
    <string name="cpp_new_in_version">Novità nella versione %1$s</string>
    <string name="cpp_release_notes_choose_theme">Vuoi provare nuove temi Material design? Selezionali dalla lista:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-it/text_wizard.xml
+++ b/app/src/main/res/values-it/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Indietro</string>
    <string name="cpp_wizard_start">Avvia la procedura guidata</string>
    <string name="cpp_wizard_finish">Fatto</string>
-    <string name="cpp_wizard_mode_simple">Semplice</string>
+    <string name="cpp_mode_simple">Semplice</string>
    <string name="cpp_wizard_mode_simple_description">Nella modaltà semplificata solo le funzionalità di base saranno disponibili dalla schermata principale. I risultati sono arrotondati fino a 5 cifre, i gradi sono utilizzati come unità di misura predefinita per gli angoli.</string>
-    <string name="cpp_wizard_mode_engineer">Ingegnere</string>
+    <string name="cpp_mode_engineer">Ingegnere</string>
  <string name="cpp_wizard_mode_engineer_description">Nella modalità ingegnere funzioni speciali saranno utilizzate sulla schermata principale.
 Il risultato non è arrotondato, ed è presentato in notazione scientifica, i radianti sono utilizzati come unità di misura per gli angoli predefinita.</string>
    <string name="cpp_restart_wizard">Avvia la procedura guidata</string>
--- a/app/src/main/res/values-ja/text_imported_aosp.xml
+++ b/app/src/main/res/values-ja/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">切り替え</string>
   <string name="cpp_add">追加</string>
   <string name="cpp_mode">モード</string>
+   <string name="cpp_enable">有効にする</string>
+   <string name="cpp_other">その他</string>
   <string name="cpp_edit">編集</string>
   <string name="cpp_delete">削除</string>
   <string name="cpp_done">完了</string>
--- a/app/src/main/res/values-ja/text_imported_other1.xml
+++ b/app/src/main/res/values-ja/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">初めに</string>
+   <string name="cpp_prefs_basic">基本設定</string>
+   <string name="cpp_prefs_advanced">詳細ツール</string>
+   <string name="cpp_report_problem">問題を報告</string>
+   <string name="cpp_help">ヘルプ</string>
+</resources>
--- a/app/src/main/res/values-ja/text_microsoft.xml
+++ b/app/src/main/res/values-ja/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">外観</string>
+   <string name="cpp_number_format">表示形式</string>
+   <string name="cpp_system_language">システム言語</string>
+   <string name="cpp_format">書式</string>
+   <string name="cpp_angles">アングル</string>
+   <string name="cpp_thousands_separator">3 桁の区切り文字</string>
+   <string name="cpp_examples">使用例</string>
+</resources>
--- a/app/src/main/res/values-ja/text_strings.xml
+++ b/app/src/main/res/values-ja/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (ウィンドウモード)</string>
    <string name="c_result_copied">計算結果をクリップボードにコピーしました！</string>
    <string name="c_vars_and_constants">変数と定数</string>
@ -16,7 +16,7 @@
  <string name="c_calc_science_notation_summary">有効にすると、強制的に科学的表記法を用います
 		(12.34E-12)
 	</string>
-    <string name="p_calc_result_precision_title">計算結果の有効桁数</string>
+    <string name="cpp_precision">計算結果の有効桁数</string>
    <string name="c_save">保存</string>
    <string name="removal_confirmation">削除の確認</string>
    <string name="c_var_removal_confirmation_question">本当に変数 \'%s\' を削除しますか？</string>
@ -32,26 +32,26 @@
    <string name="c_history">履歴</string>
    <string name="c_char_is_not_accepted">文字\'%s\'は変数名として利用できません!</string>
    <string name="c_calc_angle_units">現在の角度の単位</string>
-    <string name="p_deg">度</string>
-    <string name="p_rad">ラジアン</string>
-    <string name="p_grad">グラジアン</string>
-    <string name="p_turns">ターン</string>
+    <string name="cpp_deg">度</string>
+    <string name="cpp_rad">ラジアン</string>
+    <string name="cpp_grad">グラジアン</string>
+    <string name="cpp_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">10進法</string>
-    <string name="p_hex">16進法</string>
-    <string name="p_oct">8進法</string>
-    <string name="p_bin">2進法</string>
+    <string name="cpp_dec">10進法</string>
+    <string name="cpp_hex">16進法</string>
+    <string name="cpp_oct">8進法</string>
+    <string name="cpp_bin">2進法</string>
    <string name="c_calc_theme">テーマ</string>
-    <string name="p_metro_blue_theme">メトロブルー</string>
+    <string name="cpp_theme_metro_blue">メトロブルー</string>
    <string name="p_metro_green_theme">メトログリーン</string>
    <string name="p_metro_purple_theme">メトロパープル</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
    <string name="c_calc_result_precision_summary">計算結果の有効桁数(計算はこの設定に関係なく最大精度で行われます)</string>
-    <string name="p_grouping_separator_no">区切り記号なし</string>
-    <string name="p_grouping_separator_apostrophe">アポストロフィ (\')</string>
-    <string name="p_grouping_separator_space">スペース( )</string>
+    <string name="cpp_thousands_separator_no">区切り記号なし</string>
+    <string name="cpp_thousands_separator_apostrophe">アポストロフィ (\')</string>
+    <string name="cpp_thousands_separator_space">スペース( )</string>
    <string name="c_calc_grouping_separator">グループの区切り</string>
    <string name="c_calc_grouping_separator_summary">グループの区切りを設定します</string>
    <string name="not_valid_result">現在の結果が正しくありません!</string>
@ -94,8 +94,8 @@
    <string name="preferred_angle_units_message">デフォルトの角度の単位\'%1$s\'が現在の\'%2$s\'と異なっています。元に戻しますか？</string>
    <string name="close">閉じる</string>
    <string name="open_onscreen_calculator">クリックしてウィンドウモードで電卓を開きます</string>
-    <string name="prefs_onscreen_title">電卓(ウィンドウモード)の設定</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">電卓(ウィンドウモード)の設定</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">ウィンドウモードのアイコンを表示(再起動が必要)</string>
    <string name="prefs_onscreen_show_app_icon_summary">有効にするとアプリケーションのリストに2つ目のアイコンを表示します</string>
    <string name="cpp_this_change_may_require_reboot">この変更は再起動を必要とします</string>
@ -117,5 +117,4 @@
    <string name="cpp_clear_history">消去</string>
    <string name="cpp_new_in_version">%1$sバージョンの新機能</string>
    <string name="cpp_release_notes_choose_theme">新しいマテリアルテーマを試してみたいですか？リストから選択してください:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-ja/text_wizard.xml
+++ b/app/src/main/res/values-ja/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">戻る</string>
    <string name="cpp_wizard_start">ウィザードを開始</string>
    <string name="cpp_wizard_finish">完了</string>
-    <string name="cpp_wizard_mode_simple">シンプル</string>
+    <string name="cpp_mode_simple">シンプル</string>
  <string name="cpp_wizard_mode_simple_description">シンプルモードでは基本的な関数のみが利用可能です。
 結果は5桁でまるめられ、角度の単位は初期設定のものが用いられます。</string>
-    <string name="cpp_wizard_mode_engineer">技術者</string>
+    <string name="cpp_mode_engineer">技術者</string>
  <string name="cpp_wizard_mode_engineer_description">技術者モードでは、特別な関数がメイン画面に表示されるようになります。
 		計算結果は丸めず、技術者表記で表示され、デフォルトの角度の単位としてラジアンが使用されます。
 	</string>
--- a/app/src/main/res/values-nl/text_imported_aosp.xml
+++ b/app/src/main/res/values-nl/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Overschakelen</string>
   <string name="cpp_add">Toevoegen</string>
   <string name="cpp_mode">Modus</string>
+   <string name="cpp_enable">Inschakelen</string>
+   <string name="cpp_other">Overige</string>
   <string name="cpp_edit">Bewerken</string>
   <string name="cpp_delete">Verwijderen</string>
   <string name="cpp_done">Gereed</string>
--- a/app/src/main/res/values-nl/text_imported_other1.xml
+++ b/app/src/main/res/values-nl/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Introductie</string>
+   <string name="cpp_prefs_basic">Basis</string>
+   <string name="cpp_prefs_advanced">Geavanceerd</string>
+   <string name="cpp_report_problem">Probleem melden</string>
+   <string name="cpp_help">Help</string>
+</resources>
--- a/app/src/main/res/values-nl/text_microsoft.xml
+++ b/app/src/main/res/values-nl/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Vormgeving</string>
+   <string name="cpp_number_format">Getalnotatie</string>
+   <string name="cpp_system_language">Taal van besturingssysteem</string>
+   <string name="cpp_format">Niet-ondersteunde gegevensindeling.</string>
+   <string name="cpp_angles">Hoeken</string>
+   <string name="cpp_thousands_separator">Scheidingsteken voor duizendtallen</string>
+   <string name="cpp_examples">Voorbeelden</string>
+</resources>
--- a/app/src/main/res/values-nl/text_strings.xml
+++ b/app/src/main/res/values-nl/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
    <string name="c_result_copied">Resultaat is gekopieerd naar het klembord!</string>
    <string name="c_vars_and_constants">Variabelen en constanten</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Schakelt afronding van het resultaat aan</string>
    <string name="c_calc_science_notation_title">Altijd wetenschappelijke notatie</string>
    <string name="c_calc_science_notation_summary">Indien ingeschakeld uitsluitend wetenschappelijke notatie voor output gebruiken (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Nauwkeurigheid van resultaat</string>
+    <string name="cpp_precision">Nauwkeurigheid van resultaat</string>
    <string name="c_save">Opslaan</string>
    <string name="removal_confirmation">Verwijderen bevestigen</string>
    <string name="c_var_removal_confirmation_question">Wilt u echt \'%s\' variabele verwijderen?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radialen</string>
-    <string name="p_grad">Decimale graden</string>
-    <string name="p_turns">Bogen</string>
+    <string name="cpp_deg">Graden</string>
+    <string name="cpp_rad">Radialen</string>
+    <string name="cpp_grad">Decimale graden</string>
+    <string name="cpp_turns">Bogen</string>
    <string name="c_angle_units_summary">Hiermee definieert u de maateenheden voor hoeken om te gebruiken in berekeningen</string>
    <string name="c_calc_numeral_bases">Huidige numeriek systeem</string>
    <string name="c_numeral_bases_summary">Definieert het numeriek systeem die moet worden gebruikt in berekeningen</string>
-    <string name="p_dec">Decimaal</string>
-    <string name="p_hex">Hexadecimaal</string>
-    <string name="p_oct">Octaal</string>
-    <string name="p_bin">Binair</string>
+    <string name="cpp_dec">Decimaal</string>
+    <string name="cpp_hex">Hexadecimaal</string>
+    <string name="cpp_oct">Octaal</string>
+    <string name="cpp_bin">Binair</string>
    <string name="c_calc_theme">Thema</string>
-    <string name="p_metro_blue_theme">Metro blauw</string>
+    <string name="cpp_theme_metro_blue">Metro blauw</string>
    <string name="p_metro_green_theme">Metro groen</string>
    <string name="p_metro_purple_theme">Metro paars</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="p_grouping_separator_no">Geen groeperingsscheidingsteken</string>
-    <string name="p_grouping_separator_apostrophe">Apostrof (\')</string>
-    <string name="p_grouping_separator_space">Spatie ( )</string>
+    <string name="cpp_thousands_separator_no">Geen groeperingsscheidingsteken</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrof (\')</string>
+    <string name="cpp_thousands_separator_space">Spatie ( )</string>
    <string name="c_calc_grouping_separator">Groeperingsscheidingsteken</string>
    <string name="c_calc_grouping_separator_summary">Configureert scheiding tussen groepen</string>
    <string name="not_valid_result">Huidige resultaat is niet geldig!</string>
@ -94,8 +94,8 @@
 	</string>
    <string name="close">Sluiten</string>
    <string name="open_onscreen_calculator">Klik om de rekenmachine te openen in de venstermodus</string>
-    <string name="prefs_onscreen_title">Rekenmachine (in apart venster) instellingen</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Rekenmachine (in apart venster) instellingen</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Toon afzonderlijk pictogram (opnieuw opstarten is vereist)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Indien aangevinkt wordt een tweed icoon zichtbaar in de app lijst</string>
    <string name="cpp_this_change_may_require_reboot">Deze wijziging vereist mogelijks opnieuw op te starten</string>
@ -116,5 +116,4 @@ Door op volgende te drukken, wordt u doorverwezen naar de Google Play store om d
    <string name="cpp_clear_history">Verwijder</string>
    <string name="cpp_new_in_version">Nieuw in versie %1$s</string>
    <string name="cpp_release_notes_choose_theme">Wilt u nieuwe Material themes proberen? Kies ze uit de lijst:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-nl/text_wizard.xml
+++ b/app/src/main/res/values-nl/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Terug</string>
    <string name="cpp_wizard_start">Wizard starten</string>
    <string name="cpp_wizard_finish">Voltooid</string>
-    <string name="cpp_wizard_mode_simple">Eenvoudig</string>
+    <string name="cpp_mode_simple">Eenvoudig</string>
    <string name="cpp_wizard_mode_simple_description">In de simple mode zal alleen basis functionaliteit beschikbaar zijn van het belangrijkste scherm.   Resultaat is afgerond tot op maximaal 5 cijfers, graden worden gebruikt als de standaardeenheden voor hoeken. </string>
-    <string name="cpp_wizard_mode_engineer">Ingenieur</string>
+    <string name="cpp_mode_engineer">Ingenieur</string>
  <string name="cpp_wizard_mode_engineer_description">In ingenieur modus worden speciale functies gebruikt op het hoofdscherm.
 Resultaat is niet afgerond en wordt gepresenteerd in de ingenieursnotatie, radialen worden gebruikt als de standaardeenheden voor hoeken. </string>
    <string name="cpp_restart_wizard">Wizard starten</string>
--- a/app/src/main/res/values-pl/text_imported_aosp.xml
+++ b/app/src/main/res/values-pl/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Przełącz</string>
   <string name="cpp_add">Dodaj</string>
   <string name="cpp_mode">Tryb lokalizacji</string>
+   <string name="cpp_enable">Włącz</string>
+   <string name="cpp_other">Inne</string>
   <string name="cpp_edit">Edytuj</string>
   <string name="cpp_delete">Usuń</string>
   <string name="cpp_done">Gotowe</string>
--- a/app/src/main/res/values-pl/text_imported_other1.xml
+++ b/app/src/main/res/values-pl/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Wprowadzenie</string>
+   <string name="cpp_prefs_basic">Podstawowe</string>
+   <string name="cpp_prefs_advanced">Zaawansowane</string>
+   <string name="cpp_report_problem">Zgłoś problem</string>
+   <string name="cpp_help">Pomoc</string>
+</resources>
--- a/app/src/main/res/values-pl/text_microsoft.xml
+++ b/app/src/main/res/values-pl/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Wygląd</string>
+   <string name="cpp_number_format">Format liczby</string>
+   <string name="cpp_system_language">Język systemu operacyjnego</string>
+   <string name="cpp_format">Format</string>
+   <string name="cpp_angles">Kąty</string>
+   <string name="cpp_thousands_separator">Separator tysięcy</string>
+   <string name="cpp_examples">Przykłady</string>
+</resources>
--- a/app/src/main/res/values-pl/text_strings.xml
+++ b/app/src/main/res/values-pl/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (tryb okna)</string>
    <string name="c_result_copied">Wynik został skopiowany do schowka!</string>
    <string name="c_vars_and_constants">Zmienne i stałe</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Włącza zaokrąglanie wyniku</string>
    <string name="c_calc_science_notation_title">Zawsze notacja naukowa</string>
    <string name="c_calc_science_notation_summary">Wymusza użycie notacji naukowej na wyjściu (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Dokładność wyniku</string>
+    <string name="cpp_precision">Dokładność wyniku</string>
    <string name="c_save">Zapisz</string>
    <string name="removal_confirmation">Potwierdzenie usunięcia</string>
    <string name="c_var_removal_confirmation_question">Czy na pewno chcesz usunąć zmienną \'%s\'?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radiany</string>
-    <string name="p_grad">Grady</string>
-    <string name="p_turns">Obroty</string>
+    <string name="cpp_deg">Stopnie</string>
+    <string name="cpp_rad">Radiany</string>
+    <string name="cpp_grad">Grady</string>
+    <string name="cpp_turns">Obroty</string>
    <string name="c_angle_units_summary">Określa jednostkę dla kątów wykorzystywaną w obliczeniach</string>
    <string name="c_calc_numeral_bases">Obecny system liczbowy</string>
    <string name="c_numeral_bases_summary">Określa system liczbowy wykorzystywany w obliczeniach</string>
-    <string name="p_dec">Dziesiętny</string>
-    <string name="p_hex">Szesnastkowy</string>
-    <string name="p_oct">Ósemkowy</string>
-    <string name="p_bin">Binarny</string>
+    <string name="cpp_dec">Dziesiętny</string>
+    <string name="cpp_hex">Szesnastkowy</string>
+    <string name="cpp_oct">Ósemkowy</string>
+    <string name="cpp_bin">Binarny</string>
    <string name="c_calc_theme">Motyw</string>
-    <string name="p_metro_blue_theme">Niebieski Metro</string>
+    <string name="cpp_theme_metro_blue">Niebieski Metro</string>
    <string name="p_metro_green_theme">Zielony Metro</string>
    <string name="p_metro_purple_theme">Fioletowy Metro</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="p_grouping_separator_no">Bez grupowania</string>
-    <string name="p_grouping_separator_apostrophe">Apostrof (\')</string>
-    <string name="p_grouping_separator_space">Spacja ( )</string>
+    <string name="cpp_thousands_separator_no">Bez grupowania</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrof (\')</string>
+    <string name="cpp_thousands_separator_space">Spacja ( )</string>
    <string name="c_calc_grouping_separator">Grupowanie cyfr</string>
    <string name="c_calc_grouping_separator_summary">Ustawia znak grupujący cyfry</string>
    <string name="not_valid_result">Obecny wynik jest nieprawidłowy!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Domyślna jednostka wielkości kąta \'%1$s\' różni się od obecnej \'%2$s\'. Nie zapomniałeś zmienić tej opcji?</string>
    <string name="close">Zamknij</string>
    <string name="open_onscreen_calculator">Kliknij, aby otworzyć kalkulator w trybie okna</string>
-    <string name="prefs_onscreen_title">Ustawienia kalkulatora (w osobnym oknie)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Ustawienia kalkulatora (w osobnym oknie)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Pokaż oddzielną ikonę (wymagany restart)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Druga ikona pojawi się na liście aplikacji</string>
    <string name="cpp_this_change_may_require_reboot">Ta zmiana może wymagać ponownego uruchomienia</string>
@ -112,5 +112,4 @@
    <string name="cpp_clear_history">Wyczyszczono</string>
    <string name="cpp_new_in_version">Nowści w wersji %1$s</string>
    <string name="cpp_release_notes_choose_theme">Czy chcesz wypróbować nowe motywy Material? Wybierz je z listy:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-pl/text_wizard.xml
+++ b/app/src/main/res/values-pl/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Wstecz</string>
    <string name="cpp_wizard_start">Rozpocznij konfigurację</string>
    <string name="cpp_wizard_finish">Gotowe</string>
-    <string name="cpp_wizard_mode_simple">Prosty</string>
+    <string name="cpp_mode_simple">Prosty</string>
  <string name="cpp_wizard_mode_simple_description">W trybie prostym tylko podstawowe funkcje będą dostępne na ekranie głównym.
 Wynik jest zaokrąglony do 5 cyfr, a domyślną jednostką wielkości kąta są stopnie.</string>
-    <string name="cpp_wizard_mode_engineer">Inżynierski</string>
+    <string name="cpp_mode_engineer">Inżynierski</string>
  <string name="cpp_wizard_mode_engineer_description">W trybie inżynierskim specjalne funkcje będą dostępne na ekranie głównym.
 Wynik nie jest zaokrąglony i jest przedstawiony w postaci inżynierskiej, a domyślną jednostką wielkości kąta są radiany.</string>
    <string name="cpp_restart_wizard">Zacznij konfigurację</string>
--- a/app/src/main/res/values-pt-rBR/text_imported_aosp.xml
+++ b/app/src/main/res/values-pt-rBR/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Alternar</string>
   <string name="cpp_add">Adicionar</string>
   <string name="cpp_mode">Modo</string>
+   <string name="cpp_enable">Ativar</string>
+   <string name="cpp_other">Outros</string>
   <string name="cpp_edit">Editar</string>
   <string name="cpp_delete">Excluir</string>
   <string name="cpp_done">Concluído</string>
--- a/app/src/main/res/values-pt-rBR/text_imported_other1.xml
+++ b/app/src/main/res/values-pt-rBR/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Introdução</string>
+   <string name="cpp_prefs_basic">Básico</string>
+   <string name="cpp_prefs_advanced">Avançado</string>
+   <string name="cpp_report_problem">Notificar um problema</string>
+   <string name="cpp_help">Ajuda</string>
+</resources>
--- a/app/src/main/res/values-pt-rBR/text_microsoft.xml
+++ b/app/src/main/res/values-pt-rBR/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Aparência</string>
+   <string name="cpp_number_format">Formato do Número</string>
+   <string name="cpp_system_language">Idioma do Sistema</string>
+   <string name="cpp_format">Formato</string>
+   <string name="cpp_angles">Ângulos</string>
+   <string name="cpp_thousands_separator">Separador de milhares</string>
+   <string name="cpp_examples">Exemplos</string>
+</resources>
--- a/app/src/main/res/values-pt-rBR/text_strings.xml
+++ b/app/src/main/res/values-pt-rBR/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (Modo Janela)</string>
    <string name="c_result_copied">Resultado foi copiado para a área de transferência!</string>
    <string name="c_vars_and_constants">Variáveis e constantes</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Alterna arredondamento do resultado</string>
    <string name="c_calc_science_notation_title">Notação científica sempre</string>
    <string name="c_calc_science_notation_summary">Se ligado, usa somente a notação científica para apresentar o resultado (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Precisão do resultado</string>
+    <string name="cpp_precision">Precisão do resultado</string>
    <string name="c_save">Salvar</string>
    <string name="removal_confirmation">Confirmação de remoção</string>
    <string name="c_var_removal_confirmation_question">Você quer realmente excluir a variável \'%s\'?</string>
@ -30,26 +30,26 @@
    <string name="c_history">Histórico</string>
    <string name="c_char_is_not_accepted">Caractere \'%s\' não é aceito em nome de variável!</string>
    <string name="c_calc_angle_units">Unidade atual de ângulo</string>
-    <string name="p_deg">Graus</string>
-    <string name="p_rad">Radianos</string>
-    <string name="p_grad">Grados</string>
-    <string name="p_turns">Transforma</string>
+    <string name="cpp_deg">Graus</string>
+    <string name="cpp_rad">Radianos</string>
+    <string name="cpp_grad">Grados</string>
+    <string name="cpp_turns">Transforma</string>
    <string name="c_angle_units_summary">Define as unidades de ângulos para ser usado em cálculos</string>
    <string name="c_calc_numeral_bases">Sistema numeral atual</string>
    <string name="c_numeral_bases_summary">Define o sistema de numeração a ser usado nos cálculos</string>
-    <string name="p_dec">Decimal</string>
-    <string name="p_hex">Hexadecimal</string>
-    <string name="p_oct">Octal</string>
-    <string name="p_bin">Binário</string>
+    <string name="cpp_dec">Decimal</string>
+    <string name="cpp_hex">Hexadecimal</string>
+    <string name="cpp_oct">Octal</string>
+    <string name="cpp_bin">Binário</string>
    <string name="c_calc_theme">Tema</string>
-    <string name="p_metro_blue_theme">Metro Blue</string>
+    <string name="cpp_theme_metro_blue">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_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="p_grouping_separator_no">Sem separador de agrupamento</string>
-    <string name="p_grouping_separator_apostrophe">Apóstrofo (\')</string>
-    <string name="p_grouping_separator_space">Espaço ( )</string>
+    <string name="cpp_thousands_separator_no">Sem separador de agrupamento</string>
+    <string name="cpp_thousands_separator_apostrophe">Apóstrofo (\')</string>
+    <string name="cpp_thousands_separator_space">Espaço ( )</string>
    <string name="c_calc_grouping_separator">Separador de agrupamento</string>
    <string name="c_calc_grouping_separator_summary">Separador de agrupamento de conjuntos</string>
    <string name="not_valid_result">O resultado atual não é válido!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Padrão de unidade para ângulos \'%1$s\' difere do atual \'%2$s\'. Você esqueceu de mudar de volta?</string>
    <string name="close">Fechar</string>
    <string name="open_onscreen_calculator">Clique para abrir a calculadora no modo de janela</string>
-    <string name="prefs_onscreen_title">Configurações de calculadora (em uma janela separada)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Configurações de calculadora (em uma janela separada)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se ligado, um segundo ícone será mostrado na lista de aplicações</string>
    <string name="cpp_this_change_may_require_reboot">Essa mudança pode exigir reinicialização</string>
@ -112,5 +112,4 @@
    <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>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/text_wizard.xml
+++ b/app/src/main/res/values-pt-rBR/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Voltar</string>
    <string name="cpp_wizard_start">Iniciar assistente de configuração</string>
    <string name="cpp_wizard_finish">Concluído</string>
-    <string name="cpp_wizard_mode_simple">Simples</string>
+    <string name="cpp_mode_simple">Simples</string>
    <string name="cpp_wizard_mode_simple_description">No modo simples, apenas as funcionalidades básicas estarão disponíveis na tela principal. Os resultados serão arredondados para 5 dígitos e os ângulos serão medidos em grau.</string>
-    <string name="cpp_wizard_mode_engineer">Engenheiro</string>
+    <string name="cpp_mode_engineer">Engenheiro</string>
    <string name="cpp_wizard_mode_engineer_description">No modo Engenheiro as funções especiais serão exibidas na tela principal. Os resultados não serão arredondados e serão apresentados em notação de engenharia. Além disso, a unidade de ângulo padrão será o radiano.</string>
    <string name="cpp_restart_wizard">Iniciar assistente de configuração</string>
    <string name="cpp_wizard_dragbutton_action_end">Excelente! Toque no botão mais uma vez para tentar novamente</string>
--- a/app/src/main/res/values-pt-rPT/text_imported_aosp.xml
+++ b/app/src/main/res/values-pt-rPT/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Alternar</string>
   <string name="cpp_add">Adicionar</string>
   <string name="cpp_mode">Modo</string>
+   <string name="cpp_enable">Ativar</string>
+   <string name="cpp_other">Outros</string>
   <string name="cpp_edit">Editar</string>
   <string name="cpp_delete">Eliminar</string>
   <string name="cpp_done">Concluído</string>
--- a/app/src/main/res/values-pt-rPT/text_imported_other1.xml
+++ b/app/src/main/res/values-pt-rPT/text_imported_other1.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
--- a/app/src/main/res/values-pt-rPT/text_microsoft.xml
+++ b/app/src/main/res/values-pt-rPT/text_microsoft.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Aspeto</string>
+   <string name="cpp_number_format">Formato do Número</string>
+   <string name="cpp_system_language">Idioma do Sistema Operativo</string>
+   <string name="cpp_format">Formato de dados não suportado.</string>
+   <string name="cpp_angles">Ângulos</string>
+   <string name="cpp_examples">Exemplos</string>
+</resources>
--- a/app/src/main/res/values-pt-rPT/text_strings.xml
+++ b/app/src/main/res/values-pt-rPT/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (Modo de Janela)</string>
    <string name="c_result_copied">O resultado foi copiado para a área de transferência!</string>
    <string name="c_vars_and_constants">Variáveis e Constantes</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Alterna o arredondamento do resultado</string>
    <string name="c_calc_science_notation_title">Sempre em notação científica</string>
    <string name="c_calc_science_notation_summary">Se ligado força a utilização de notação científica no output (12.34€-12)</string>
-    <string name="p_calc_result_precision_title">Precisão do resultado</string>
+    <string name="cpp_precision">Precisão do resultado</string>
    <string name="c_save">Guardar</string>
    <string name="removal_confirmation">Confirmação de remoção</string>
    <string name="c_var_removal_confirmation_question">Deseja realmente apagar a variável \'%s\'?</string>
@ -30,26 +30,26 @@
    <string name="c_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>
-    <string name="p_rad">Radianos</string>
-    <string name="p_grad">Gradianos</string>
-    <string name="p_turns">Volta</string>
+    <string name="cpp_deg">Graus</string>
+    <string name="cpp_rad">Radianos</string>
+    <string name="cpp_grad">Gradianos</string>
+    <string name="cpp_turns">Volta</string>
    <string name="c_angle_units_summary">Define as unidades de ângulo a serem utilizadas nos cálculos</string>
    <string name="c_calc_numeral_bases">Sistema numérico actual</string>
    <string name="c_numeral_bases_summary">Define o sistema numérico para ser usado nos cálculos</string>
-    <string name="p_dec">Decimal</string>
-    <string name="p_hex">Hexadecimal</string>
-    <string name="p_oct">Octal</string>
-    <string name="p_bin">Binário</string>
+    <string name="cpp_dec">Decimal</string>
+    <string name="cpp_hex">Hexadecimal</string>
+    <string name="cpp_oct">Octal</string>
+    <string name="cpp_bin">Binário</string>
    <string name="c_calc_theme">Tema</string>
-    <string name="p_metro_blue_theme">Metro Blue</string>
+    <string name="cpp_theme_metro_blue">Metro Blue</string>
    <string name="p_metro_green_theme">Metro Green</string>
    <string name="p_metro_purple_theme">Metro Purple</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">Não existe separador de grupo</string>
+    <string name="cpp_thousands_separator_apostrophe">Apóstrofe (\')</string>
+    <string name="cpp_thousands_separator_space">Espaço ( )</string>
    <string name="c_calc_grouping_separator">Separador de grupo</string>
    <string name="c_calc_grouping_separator_summary">Aplica o separador de grupo</string>
    <string name="not_valid_result">O resultado actual não é válido!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Unidades angulares padrão \'%1$s\' diferentes das atuais \'%2$s\'. Esqueceu-se de mudar?</string>
    <string name="close">Fechar</string>
    <string name="open_onscreen_calculator">Clique para abrir a calculadora em modo de janela</string>
-    <string name="prefs_onscreen_title">Configurações da calculadora (em modo de janela)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Configurações da calculadora (em modo de janela)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Mostrar ícone separado (requer reinicialização)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Se selecionado, o segundo ícone será mostrado na lista de aplicações</string>
    <string name="cpp_this_change_may_require_reboot">Esta alteração pode necessitar de reinicialização</string>
@ -112,5 +112,4 @@
    <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_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/text_wizard.xml
+++ b/app/src/main/res/values-pt-rPT/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Voltar</string>
    <string name="cpp_wizard_start">Inicie o wizard</string>
    <string name="cpp_wizard_finish">Concluído</string>
-    <string name="cpp_wizard_mode_simple">Simples</string>
+    <string name="cpp_mode_simple">Simples</string>
  <string name="cpp_wizard_mode_simple_description">No modo simples apenas as funcionalidades básicas estarão disponíveis a partir do ecrã principal.
 O resultado é arredondado para 5 dígitos, graus são usados por defeito como unidades de ângulo.</string>
-    <string name="cpp_wizard_mode_engineer">Engenheiro</string>
+    <string name="cpp_mode_engineer">Engenheiro</string>
  <string name="cpp_wizard_mode_engineer_description">No modo de engenharia funções especiais serão utilizadas no ecrã principal.
 O resultado não é arredondado e é apresentado em notação de engenheiro, radianos serão utilizados como unidade padrão de graus.</string>
    <string name="cpp_restart_wizard">Inicie o wizard</string>
--- a/app/src/main/res/values-ru/text_imported_aosp.xml
+++ b/app/src/main/res/values-ru/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Сменить аккаунт</string>
   <string name="cpp_add">Добавить</string>
   <string name="cpp_mode">Режим</string>
+   <string name="cpp_enable">Включить</string>
+   <string name="cpp_other">Другое</string>
   <string name="cpp_edit">Изменить</string>
   <string name="cpp_delete">Удалить</string>
   <string name="cpp_done">Готово</string>
--- a/app/src/main/res/values-ru/text_imported_other1.xml
+++ b/app/src/main/res/values-ru/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Введение</string>
+   <string name="cpp_prefs_basic">Основные</string>
+   <string name="cpp_prefs_advanced">Дополнительно</string>
+   <string name="cpp_report_problem">Сообщить о проблеме</string>
+   <string name="cpp_help">Справка</string>
+</resources>
--- a/app/src/main/res/values-ru/text_microsoft.xml
+++ b/app/src/main/res/values-ru/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Внешний вид</string>
+   <string name="cpp_number_format">Формат чисел</string>
+   <string name="cpp_system_language">Системный язык</string>
+   <string name="cpp_format">Формат</string>
+   <string name="cpp_angles">Углы</string>
+   <string name="cpp_thousands_separator">Разделитель разрядов тысяч</string>
+   <string name="cpp_examples">Примеры</string>
+</resources>
--- a/app/src/main/res/values-ru/text_strings.xml
+++ b/app/src/main/res/values-ru/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Калькулятор++</string>
+    <string name="cpp_app_name">Калькулятор++</string>
    <string name="c_app_name_on_screen">Калькулятор++ (В отдельном окне)</string>
    <string name="c_result_copied">Результат был скопирован в буфер обмена!</string>
    <string name="c_vars_and_constants">Переменные и константы</string>
@ -16,7 +16,7 @@
  <string name="c_calc_science_notation_summary">Если включено - результат будет всегда записан в научной форме
 		(12.34E-12)
 	</string>
-    <string name="p_calc_result_precision_title">Точность результата</string>
+    <string name="cpp_precision">Точность</string>
    <string name="c_save">Сохранить</string>
    <string name="removal_confirmation">Подтверждение удаления</string>
    <string name="c_var_removal_confirmation_question">Вы действительно хотите удалить переменную \'%s\'?</string>
@ -36,30 +36,30 @@
    <string name="c_history">История</string>
    <string name="c_char_is_not_accepted">Символ \'%s\' не допустим в названии переменной!</string>
    <string name="c_calc_angle_units">Текущие единицы измерения углов</string>
-    <string name="p_deg">Градусы</string>
-    <string name="p_rad">Радианы</string>
-    <string name="p_grad">Грады</string>
-    <string name="p_turns">Обороты</string>
+    <string name="cpp_deg">Градусы</string>
+    <string name="cpp_rad">Радианы</string>
+    <string name="cpp_grad">Грады</string>
+    <string name="cpp_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="cpp_dec">Десятичная</string>
+    <string name="cpp_hex">Шестнадцатеричная</string>
+    <string name="cpp_oct">Восьмеричная</string>
+    <string name="cpp_bin">Бинарная</string>
    <string name="c_calc_theme">Тема оформления</string>
-    <string name="p_metro_blue_theme">Метро Синяя</string>
+    <string name="cpp_theme_metro_blue">Метро Синяя</string>
    <string name="p_metro_green_theme">Метро Зелёная</string>
    <string name="p_metro_purple_theme">Метро Фиолетовая</string>
-    <string name="p_use_app_theme">Тема приложения</string>
+    <string name="cpp_theme_app">Тема приложения</string>
  <string name="c_calc_result_precision_summary">Точность результата(все вычисления производятся максимально точно)
 	</string>
-    <string name="p_grouping_separator_no">Не использовать разделитель разрядов</string>
-    <string name="p_grouping_separator_apostrophe">Апостроф (\')</string>
-    <string name="p_grouping_separator_space">Пробел ( )</string>
+    <string name="cpp_thousands_separator_no">Не использовать разделитель разрядов</string>
+    <string name="cpp_thousands_separator_apostrophe">Апостроф (\')</string>
+    <string name="cpp_thousands_separator_space">Пробел ( )</string>
    <string name="c_calc_grouping_separator">Разделитель разрядов</string>
    <string name="c_calc_grouping_separator_summary">Устанавливает разделитель разрядов числа</string>
    <string name="not_valid_result">Результат не допустим!</string>
@ -111,8 +111,8 @@
 	</string>
    <string name="close">Закрыть</string>
    <string name="open_onscreen_calculator">Нажмите чтобы открыть калькулятор в отдельном окне</string>
-    <string name="prefs_onscreen_title">Настройки калькулятора в отдельном окне</string>
-    <string name="prefs_widget_title">Настройки виджета</string>
+    <string name="cpp_floating_calculator">Калькулятор в отдельном окне</string>
+    <string name="cpp_widget">Виджет</string>
  <string name="prefs_onscreen_show_app_icon_title">Показывать отдельную иконку (может потребовать перезагрузки)
 	</string>
  <string name="prefs_onscreen_show_app_icon_summary">Если включено, то вторая иконка будет добавлена в список
@ -139,11 +139,9 @@
    <string name="cpp_clear_history">Очистить</string>
    <string name="cpp_new_in_version">Новое в версии %1$s</string>
    <string name="cpp_release_notes_choose_theme">Хотите попробовать новые темы в стиле Матириал? Выберите их из списка:</string>
-    <string name="cpp_system_language">Язык системы</string>
  <string name="cpp_fn_parameter">Параметр</string>
  <string name="cpp_fn_duplicate_parameter">Параметр с таким именем уже существует</string>
  <string name="cpp_invalid_name">Имя содержит недопустимые символы</string>
-    <string name="cpp_angles">Углы</string>
-    <string name="cpp_radix">Система</string>
+  <string name="cpp_radix">Система</string>
  <string name="cpp_numeral_system">Система счисления</string>
 </resources>
--- a/app/src/main/res/values-ru/text_wizard.xml
+++ b/app/src/main/res/values-ru/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Назад</string>
    <string name="cpp_wizard_start">Начать визард</string>
    <string name="cpp_wizard_finish">Готово</string>
-    <string name="cpp_wizard_mode_simple">Простой</string>
+    <string name="cpp_mode_simple">Простой</string>
    <string name="cpp_wizard_mode_simple_description">В простом режиме только базовая функциональность доступна на главном экране. Результат округляется до 5 знаков, градусы установлены единицами измерения углов по умолчанию.</string>
-    <string name="cpp_wizard_mode_engineer">Инженерный</string>
+    <string name="cpp_mode_engineer">Инженерный</string>
    <string name="cpp_wizard_mode_engineer_description">В инженерном режиме дополнительные функции доступны на главном экране. Результат не округляется и представлен в инженерной нотации, радианы установлены единицами измерения углов по умолчанию.</string>
    <string name="cpp_restart_wizard">Начать визард</string>
    <string name="cpp_wizard_dragbutton_action_end">Замечательно! Нажмите на кнопку ещё раз, чтобы повторить сначала</string>
--- a/app/src/main/res/values-tr/text_imported_aosp.xml
+++ b/app/src/main/res/values-tr/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Değiştir</string>
   <string name="cpp_add">Ekle</string>
   <string name="cpp_mode">Mod</string>
+   <string name="cpp_enable">Etkinleştir</string>
+   <string name="cpp_other">Diğer</string>
   <string name="cpp_edit">Düzenle</string>
   <string name="cpp_delete">Sil</string>
   <string name="cpp_done">Bitti</string>
--- a/app/src/main/res/values-tr/text_imported_other1.xml
+++ b/app/src/main/res/values-tr/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Giriş</string>
+   <string name="cpp_prefs_basic">Basit</string>
+   <string name="cpp_prefs_advanced">Gelişmiş</string>
+   <string name="cpp_report_problem">Bir sorun bildir</string>
+   <string name="cpp_help">Yardım</string>
+</resources>
--- a/app/src/main/res/values-tr/text_microsoft.xml
+++ b/app/src/main/res/values-tr/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Görünüm</string>
+   <string name="cpp_number_format">Sayı Biçimi</string>
+   <string name="cpp_system_language">İşletim Sistemi Dili</string>
+   <string name="cpp_format">Biçim</string>
+   <string name="cpp_angles">Açılar</string>
+   <string name="cpp_thousands_separator">Binler ayırıcısı</string>
+   <string name="cpp_examples">Örnekler</string>
+</resources>
--- a/app/src/main/res/values-tr/text_strings.xml
+++ b/app/src/main/res/values-tr/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++ (Pencere modu)</string>
    <string name="c_result_copied">Sonuç panoya kopyalandı!</string>
    <string name="c_vars_and_constants">Değişkenler ve sabitler</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Sonucu yuvarlamayı ayarlar</string>
    <string name="c_calc_science_notation_title">Her zaman bilimsel göster</string>
    <string name="c_calc_science_notation_summary">Seçilirse çıkışın sadece bilimsel gösterimini kullanmaya zorlar (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Sonuç hassasiyeti</string>
+    <string name="cpp_precision">Sonuç hassasiyeti</string>
    <string name="c_save">Kaydet</string>
    <string name="removal_confirmation">Silme onayı</string>
    <string name="c_var_removal_confirmation_question">%s değişkenini silmek istiyor musunuz?</string>
@ -30,26 +30,26 @@
    <string name="c_history">Geçmiş</string>
    <string name="c_char_is_not_accepted"> \'%s\' karakteri geçerli bir değişken ismi değil!</string>
    <string name="c_calc_angle_units">Şimdili açı birimi</string>
-    <string name="p_deg">Derece</string>
-    <string name="p_rad">Radyan</string>
-    <string name="p_grad">Gradyan</string>
-    <string name="p_turns">Döndür</string>
+    <string name="cpp_deg">Derece</string>
+    <string name="cpp_rad">Radyan</string>
+    <string name="cpp_grad">Gradyan</string>
+    <string name="cpp_turns">Döndür</string>
    <string name="c_angle_units_summary">Hesaplamalarda kullanılacak açı birimlerini tanımlayın</string>
    <string name="c_calc_numeral_bases">Mevcut sayı sistemi</string>
    <string name="c_numeral_bases_summary">Hesaplamalarda kullanılacak sayı sistemini tanımlayın</string>
-    <string name="p_dec">Demical</string>
-    <string name="p_hex">Hexadecimal</string>
-    <string name="p_oct">Sekizli</string>
-    <string name="p_bin">İkili</string>
+    <string name="cpp_dec">Demical</string>
+    <string name="cpp_hex">Hexadecimal</string>
+    <string name="cpp_oct">Sekizli</string>
+    <string name="cpp_bin">İkili</string>
    <string name="c_calc_theme">Tema</string>
-    <string name="p_metro_blue_theme">Metro mavi (varsayılan)</string>
+    <string name="cpp_theme_metro_blue">Metro mavi (varsayılan)</string>
    <string name="p_metro_green_theme">Metro yeşil</string>
    <string name="p_metro_purple_theme">Pembe Metro</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
    <string name="c_calc_result_precision_summary">Sonucun hassasiyeti(tüm hesaplamalar sizin seçimizden bağımsız olarak en yüksek hassasiyet derecesiyle yapıldı)</string>
-    <string name="p_grouping_separator_no">Grup ayracı yok</string>
-    <string name="p_grouping_separator_apostrophe">Kesme işareti (\')</string>
-    <string name="p_grouping_separator_space">Boşluk ()</string>
+    <string name="cpp_thousands_separator_no">Grup ayracı yok</string>
+    <string name="cpp_thousands_separator_apostrophe">Kesme işareti (\')</string>
+    <string name="cpp_thousands_separator_space">Boşluk ()</string>
    <string name="c_calc_grouping_separator">Gruplama ayracı</string>
    <string name="c_calc_grouping_separator_summary">Gruplama ayracını ayarlayın</string>
    <string name="not_valid_result">Şu anki sonuç geçerli değil!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Şuanki açı birimi \'%2$s\'  varsayılan açı biriminden \'%1$s\' farklı. Geri almayı mı unuttunuz?</string>
    <string name="close">Kapat</string>
    <string name="open_onscreen_calculator">Hesap makinesini pencere modunda açmak için tıklayın</string>
-    <string name="prefs_onscreen_title">Hesap makinesi (ayrı pencerede) ayarları</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Hesap makinesi (ayrı pencerede) ayarları</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Ayrı simge göster (yeniden başlatma gerektirir)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Eğer açıksa ikinci simge uygulama listesinde görünecek</string>
    <string name="cpp_this_change_may_require_reboot">Bu değişiklik, yeniden başlatma gerektirebilir</string>
@ -112,5 +112,4 @@
    <string name="cpp_clear_history">Sil</string>
    <string name="cpp_new_in_version">%1$s sürümünde yeni</string>
    <string name="cpp_release_notes_choose_theme">Yeni materyal temaları denemek istiyor musunuz?Listeden seçin:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-tr/text_wizard.xml
+++ b/app/src/main/res/values-tr/text_wizard.xml
@ -4,10 +4,10 @@
    <string name="cpp_wizard_back">Geri</string>
    <string name="cpp_wizard_start">Sihirbazı Başlat</string>
    <string name="cpp_wizard_finish">Tamamlandı</string>
-    <string name="cpp_wizard_mode_simple">Basit</string>
+    <string name="cpp_mode_simple">Basit</string>
  <string name="cpp_wizard_mode_simple_description">Temel modda ana ekranda sadece temel işlevler kullanılabilir.
 Sonuç 5 basamağa kadar yuvarlandı, varsayılan açı birimi olarak derece kullanıldı.</string>
-    <string name="cpp_wizard_mode_engineer">Mühendislik</string>
+    <string name="cpp_mode_engineer">Mühendislik</string>
    <string name="cpp_wizard_mode_engineer_description">Mühendislik modunda ana ekranda özel fonksiyonlar kullanılır. Sonuç yuvarlanmaz ve mühendislik gösterimi ile sunulur, varsayılan açı birimi olarak radyan kullanılır.</string>
    <string name="cpp_restart_wizard">Sihirbazı Başlat</string>
    <string name="cpp_wizard_dragbutton_action_end">Mükemmel! Yeniden denemek için bir kez daha dokunun</string>
--- a/app/src/main/res/values-uk/text_imported_aosp.xml
+++ b/app/src/main/res/values-uk/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Змінити користувача</string>
   <string name="cpp_add">Додати</string>
   <string name="cpp_mode">Режим</string>
+   <string name="cpp_enable">Увімкнути</string>
+   <string name="cpp_other">Інше</string>
   <string name="cpp_edit">Редагувати</string>
   <string name="cpp_delete">Видалити</string>
   <string name="cpp_done">Готово</string>
--- a/app/src/main/res/values-uk/text_imported_other1.xml
+++ b/app/src/main/res/values-uk/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Вступ</string>
+   <string name="cpp_prefs_basic">Основні</string>
+   <string name="cpp_prefs_advanced">Додатково</string>
+   <string name="cpp_report_problem">Повідомити про ваду</string>
+   <string name="cpp_help">Довідка</string>
+</resources>
--- a/app/src/main/res/values-uk/text_microsoft.xml
+++ b/app/src/main/res/values-uk/text_microsoft.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Оформлення</string>
+   <string name="cpp_number_format">Формат числа</string>
+   <string name="cpp_system_language">Його мова відповідає мові системи.</string>
+   <string name="cpp_format">Формат даних не підтримується.</string>
+   <string name="cpp_angles">Кути</string>
+</resources>
--- a/app/src/main/res/values-uk/text_strings.xml
+++ b/app/src/main/res/values-uk/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Калькулятор++</string>
+    <string name="cpp_app_name">Калькулятор++</string>
    <string name="c_app_name_on_screen">Калькулятор + + (віконний режим)</string>
    <string name="c_result_copied">Результат був скопійований до буферу обміну!</string>
    <string name="c_vars_and_constants">Змінні та константи</string>
@ -16,7 +16,7 @@
  <string name="c_calc_science_notation_summary">Якщо увімкнено, то результат буде записано лише у експоненціальній
 		формі (12.34E-12)
 	</string>
-    <string name="p_calc_result_precision_title">Точність результату</string>
+    <string name="cpp_precision">Точність результату</string>
    <string name="c_save">Зберегти</string>
    <string name="removal_confirmation">Підтвердження вилучення</string>
    <string name="c_var_removal_confirmation_question">Ви дійсно хочете вилучити змінну \'%s\'?</string>
@ -32,27 +32,27 @@
    <string name="c_history">Історія</string>
    <string name="c_char_is_not_accepted">Символ \'%s\' не допустимий у імені змінної!</string>
    <string name="c_calc_angle_units">Поточні одиниці виміру кутів</string>
-    <string name="p_deg">Градуси</string>
-    <string name="p_rad">Радіани</string>
-    <string name="p_grad">Гради</string>
-    <string name="p_turns">Обороти</string>
+    <string name="cpp_deg">Градуси</string>
+    <string name="cpp_rad">Радіани</string>
+    <string name="cpp_grad">Гради</string>
+    <string name="cpp_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="cpp_dec">Десяткова</string>
+    <string name="cpp_hex">Шістнадцяткова</string>
+    <string name="cpp_oct">Вісімкова</string>
+    <string name="cpp_bin">Двійкова</string>
    <string name="c_calc_theme">Тема</string>
-    <string name="p_metro_blue_theme">Метро Синя</string>
+    <string name="cpp_theme_metro_blue">Метро Синя</string>
    <string name="p_metro_green_theme">Метро Зелена</string>
    <string name="p_metro_purple_theme">Метро Пурпурова</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
  <string name="c_calc_result_precision_summary">Точність відображення результату (усі обчислення проводяться максимально точно, незалежно від цього параметру)
 	</string>
-    <string name="p_grouping_separator_no">Не використовувати роздільник розрядів</string>
-    <string name="p_grouping_separator_apostrophe">Апостроф (\')</string>
-    <string name="p_grouping_separator_space">Пробіл ( )</string>
+    <string name="cpp_thousands_separator_no">Не використовувати роздільник розрядів</string>
+    <string name="cpp_thousands_separator_apostrophe">Апостроф (\')</string>
+    <string name="cpp_thousands_separator_space">Пробіл ( )</string>
    <string name="c_calc_grouping_separator">Роздільник розрядів</string>
    <string name="c_calc_grouping_separator_summary">Задає роздільник розрядів</string>
    <string name="not_valid_result">Поточний результат не допустимий!</string>
@ -98,8 +98,8 @@
    <string name="preferred_angle_units_message">Типові одиниці виміру кутів - \'%1$s\' відрізняються від поточних - \'%2$s\'. Забули змінити?</string>
    <string name="close">Закрити</string>
    <string name="open_onscreen_calculator">Клацніть, щоб відкрити калькулятор у віконному режимі</string>
-    <string name="prefs_onscreen_title">Параметри Калькулятор++ (в окремому вікні)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Параметри Калькулятор++ (в окремому вікні)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Показувати окрему піктограму (потрібне перевантаження)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Якщо увімкнено, то окрема піктограма появиться у списку програм</string>
    <string name="cpp_this_change_may_require_reboot">Ця зміна може вимагати перезавантаження</string>
@ -118,5 +118,4 @@
    <string name="cpp_clear_history">Очистити</string>
    <string name="cpp_new_in_version">Нове у версії %1$s</string>
    <string name="cpp_release_notes_choose_theme">Кортить спробувати нові теми Матеріал? Вибирайте одну з них у списку:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-uk/text_wizard.xml
+++ b/app/src/main/res/values-uk/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Назад</string>
    <string name="cpp_wizard_start">Запустити майстер</string>
    <string name="cpp_wizard_finish">Зроблено</string>
-    <string name="cpp_wizard_mode_simple">Простий</string>
+    <string name="cpp_mode_simple">Простий</string>
    <string name="cpp_wizard_mode_simple_description">У простому режимі лише базові функціональні можливості будуть доступні з головного екрана.   Результат округлюється до 5 цифр, одиниці вимірювання кутів - градуси.</string>
-    <string name="cpp_wizard_mode_engineer">Інженерний</string>
+    <string name="cpp_mode_engineer">Інженерний</string>
    <string name="cpp_wizard_mode_engineer_description">У інженерному режимі додаткові функції будуть доступні на головному екрані.   Результат не округлюється і записується у науковій нотації, кути вимірюються в радіанах.</string>
    <string name="cpp_restart_wizard">Запустити майстер</string>
    <string name="cpp_wizard_dragbutton_action_end">Відмінно! Натисніть кнопку ще раз, щоб спробувати знову</string>
--- a/app/src/main/res/values-vi/text_imported_aosp.xml
+++ b/app/src/main/res/values-vi/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">Chuyển đổi</string>
   <string name="cpp_add">Thêm</string>
   <string name="cpp_mode">Chế độ</string>
+   <string name="cpp_enable">Bật</string>
+   <string name="cpp_other">Dữ liệu khác</string>
   <string name="cpp_edit">Chỉnh sửa</string>
   <string name="cpp_delete">Xóa</string>
   <string name="cpp_done">Xong</string>
--- a/app/src/main/res/values-vi/text_imported_other1.xml
+++ b/app/src/main/res/values-vi/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">Giới thiệu</string>
+   <string name="cpp_prefs_basic">Cơ bản</string>
+   <string name="cpp_prefs_advanced">Nâng cao</string>
+   <string name="cpp_report_problem">Báo cáo lỗi</string>
+   <string name="cpp_help">Trợ giúp</string>
+</resources>
--- a/app/src/main/res/values-vi/text_microsoft.xml
+++ b/app/src/main/res/values-vi/text_microsoft.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">Giao diện</string>
+   <string name="cpp_number_format">Định dạng &amp;amp;số</string>
+   <string name="cpp_format">Định dạng dữ liệu không được hỗ trợ.</string>
+</resources>
--- a/app/src/main/res/values-vi/text_strings.xml
+++ b/app/src/main/res/values-vi/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Máy tính ++</string>
+    <string name="cpp_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_result_copied">Kết quả đã được sao chép vào clipboard!</string>
    <string name="c_vars_and_constants">Biến và hằng</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">Chuyển làm tròn của kết quả</string>
    <string name="c_calc_science_notation_title">Luôn dùng ký hiệu khoa học</string>
    <string name="c_calc_science_notation_summary">Nếu bật cưỡng bức sử dụng ký hiệu khoa học (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">Độ chính xác của kết quả</string>
+    <string name="cpp_precision">Độ chính xác của kết quả</string>
    <string name="c_save">Lưu</string>
    <string name="removal_confirmation">Xác nhận xoá</string>
    <string name="c_var_removal_confirmation_question">Bạn có thực sự muốn xóa \'%s\' biến?</string>
@ -30,26 +30,26 @@
    <string name="c_history">Nhật ký</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>
-    <string name="p_rad">Radian</string>
-    <string name="p_grad">Gradians</string>
-    <string name="p_turns">Vòng (360 độ)</string>
+    <string name="cpp_deg">Độ</string>
+    <string name="cpp_rad">Radian</string>
+    <string name="cpp_grad">Gradians</string>
+    <string name="cpp_turns">Vòng (360 độ)</string>
    <string name="c_angle_units_summary">Xác định đơn vị cho góc được sử dụng trong tính toán</string>
    <string name="c_calc_numeral_bases">Hệ thống số hiện tại</string>
    <string name="c_numeral_bases_summary">Xác định hệ thống số được sử dụng trong tính toán</string>
-    <string name="p_dec">Thập phân</string>
-    <string name="p_hex">Hệ thập lục phân</string>
-    <string name="p_oct">Hệ bát phân</string>
-    <string name="p_bin">Nhị phân</string>
+    <string name="cpp_dec">Thập phân</string>
+    <string name="cpp_hex">Hệ thập lục phân</string>
+    <string name="cpp_oct">Hệ bát phân</string>
+    <string name="cpp_bin">Nhị phân</string>
    <string name="c_calc_theme">Chủ đề</string>
-    <string name="p_metro_blue_theme">Metro Blue</string>
+    <string name="cpp_theme_metro_blue">Metro Blue</string>
    <string name="p_metro_green_theme">Metro Green</string>
    <string name="p_metro_purple_theme">Metro Purple</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</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="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>
+    <string name="cpp_thousands_separator_no">Không tách nhóm</string>
+    <string name="cpp_thousands_separator_apostrophe">Apostrophe (\')</string>
+    <string name="cpp_thousands_separator_space">Space ( )</string>
    <string name="c_calc_grouping_separator">Nhóm tách</string>
    <string name="c_calc_grouping_separator_summary">Bộ nhóm tách</string>
    <string name="not_valid_result">Kết quả hiện tại là không hợp lệ!</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">Đơn vị góc mặc định \'%1$s\' khác với hiện tại \'%2$s\'. Quên thay đổi trở lại?</string>
    <string name="close">Đóng</string>
    <string name="open_onscreen_calculator">Bấm để mở máy tính trong chế độ cửa sổ</string>
-    <string name="prefs_onscreen_title">Cài đặt máy tính (trong cửa sổ riêng biệt)</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">Cài đặt máy tính (trong cửa sổ riêng biệt)</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">Hiển thị biểu tượng riêng biệt (yêu cầu khởi động lại)</string>
    <string name="prefs_onscreen_show_app_icon_summary">Nếu bật biểu tượng thứ hai sẽ được hiển thị trong danh sách ứng dụng</string>
    <string name="cpp_this_change_may_require_reboot">Sự thay đổi này có thể yêu cầu khởi động lại</string>
@ -114,5 +114,4 @@ Qua việc click nút \'Tiếp tục\' bạn được chuyển qua úng dụng G
    <string name="cpp_clear_history">Dọn sạch</string>
    <string name="cpp_new_in_version">Mới trong phiên bản %1$s</string>
    <string name="cpp_release_notes_choose_theme">Bạn có muốn thử chủ đề Material mới? Chọn chúng từ danh sách:</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-vi/text_wizard.xml
+++ b/app/src/main/res/values-vi/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">Trở lại</string>
    <string name="cpp_wizard_start">Khởi động thuật sĩ</string>
    <string name="cpp_wizard_finish">Hoàn thành</string>
-    <string name="cpp_wizard_mode_simple">Đơn giản</string>
+    <string name="cpp_mode_simple">Đơn giản</string>
    <string name="cpp_wizard_mode_simple_description">Trong chế độ đơn giản chỉ chức năng cơ bản sẽ có sẵn từ màn hình chính. Kết quả làm tròn lên đến 5 chữ số, độ được sử dụng như là các đơn vị góc mặc định.</string>
-    <string name="cpp_wizard_mode_engineer">Kỹ sư</string>
+    <string name="cpp_mode_engineer">Kỹ sư</string>
    <string name="cpp_wizard_mode_engineer_description">Trong chế độ Engineer chức năng đặc biệt sẽ được sử dụng trên màn hình chính.   Kết quả là không làm tròn và được trình bày theo cách ghi kỹ sư, radian được sử dụng như là các đơn vị góc mặc định.</string>
    <string name="cpp_restart_wizard">Khởi động thuật sĩ</string>
    <string name="cpp_wizard_dragbutton_action_end">Tuyệt vời! Bấm vào nút một lần nữa để thử lại</string>
--- a/app/src/main/res/values-zh-rCN/text_imported_aosp.xml
+++ b/app/src/main/res/values-zh-rCN/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">切换</string>
   <string name="cpp_add">添加</string>
   <string name="cpp_mode">模式</string>
+   <string name="cpp_enable">启用</string>
+   <string name="cpp_other">其他</string>
   <string name="cpp_edit">编辑</string>
   <string name="cpp_delete">删除</string>
   <string name="cpp_done">完成</string>
--- a/app/src/main/res/values-zh-rCN/text_imported_other1.xml
+++ b/app/src/main/res/values-zh-rCN/text_imported_other1.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_introduction">简介</string>
+   <string name="cpp_prefs_basic">基本</string>
+   <string name="cpp_prefs_advanced">高级</string>
+   <string name="cpp_report_problem">报告问题</string>
+   <string name="cpp_help">帮助</string>
+</resources>
--- a/app/src/main/res/values-zh-rCN/text_microsoft.xml
+++ b/app/src/main/res/values-zh-rCN/text_microsoft.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">外观</string>
+   <string name="cpp_number_format">数字格式</string>
+   <string name="cpp_system_language">系统语言</string>
+   <string name="cpp_format">格式</string>
+   <string name="cpp_angles">角度</string>
+   <string name="cpp_thousands_separator">千分位分隔符</string>
+   <string name="cpp_examples">示例</string>
+</resources>
--- a/app/src/main/res/values-zh-rCN/text_strings.xml
+++ b/app/src/main/res/values-zh-rCN/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++（悬浮）</string>
    <string name="c_result_copied">结果已复制到剪贴板！</string>
    <string name="c_vars_and_constants">变量与常数</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">切换答案的四舍五入</string>
    <string name="c_calc_science_notation_title">永远使用科学计数法</string>
    <string name="c_calc_science_notation_summary">开启此选项，则答案将永远使用科学计数法表示 (例: 12.34E-12)</string>
-    <string name="p_calc_result_precision_title">保留小数点后位数</string>
+    <string name="cpp_precision">保留小数点后位数</string>
    <string name="c_save">保存</string>
    <string name="removal_confirmation">确认移除</string>
    <string name="c_var_removal_confirmation_question">您真的要移除变量 \'%s\' 吗?</string>
@ -30,27 +30,27 @@
    <string name="c_history">历史</string>
    <string name="c_char_is_not_accepted">不能使用字符 \'%s\' 作为变量名称！</string>
    <string name="c_calc_angle_units">当前角度单位</string>
-    <string name="p_deg">度</string>
-    <string name="p_rad">弧度</string>
-    <string name="p_grad">梯度</string>
-    <string name="p_turns">圈</string>
+    <string name="cpp_deg">度</string>
+    <string name="cpp_rad">弧度</string>
+    <string name="cpp_grad">梯度</string>
+    <string name="cpp_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="cpp_dec">十进制</string>
+    <string name="cpp_hex">十六进制</string>
+    <string name="cpp_oct">八进制</string>
+    <string name="cpp_bin">二进制</string>
    <string name="c_calc_theme">主题</string>
-    <string name="p_metro_blue_theme">Metro蓝</string>
+    <string name="cpp_theme_metro_blue">Metro蓝</string>
    <string name="p_metro_green_theme">Metro绿</string>
    <string name="p_metro_purple_theme">Metro紫</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
  <string name="c_calc_result_precision_summary">结果显示的精确度（无论此项如何设置，所有的计算都使用最大
 精确度）</string>
-    <string name="p_grouping_separator_no">无</string>
-    <string name="p_grouping_separator_apostrophe">撇号 (\')</string>
-    <string name="p_grouping_separator_space">空格 ( )</string>
+    <string name="cpp_thousands_separator_no">无</string>
+    <string name="cpp_thousands_separator_apostrophe">撇号 (\')</string>
+    <string name="cpp_thousands_separator_space">空格 ( )</string>
    <string name="c_calc_grouping_separator">分节符</string>
    <string name="c_calc_grouping_separator_summary">设置分节符</string>
    <string name="not_valid_result">当前结果无效！</string>
@ -93,8 +93,8 @@
    <string name="preferred_angle_units_message">默认角度单位 %1$s 不同于当前的 %2$s。忘改回来了吗？</string>
    <string name="close">关闭</string>
    <string name="open_onscreen_calculator">单击以在悬浮窗口中打开计算器</string>
-    <string name="prefs_onscreen_title">悬浮计算器设置</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">悬浮计算器设置</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">显示单独的图标 （需要重新启动）</string>
    <string name="prefs_onscreen_show_app_icon_summary">开启此选项,将在应用程序列表中显示两个图标</string>
    <string name="cpp_this_change_may_require_reboot">此更改可能需要重新启动</string>
@ -113,5 +113,4 @@
    <string name="cpp_clear_history">清除</string>
    <string name="cpp_new_in_version">%1$s 版本的新功能</string>
    <string name="cpp_release_notes_choose_theme">你想尝试新的Material Design主题吗？请从列表中选择：</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/text_wizard.xml
+++ b/app/src/main/res/values-zh-rCN/text_wizard.xml
@ -4,9 +4,9 @@
    <string name="cpp_wizard_back">返回</string>
    <string name="cpp_wizard_start">启动向导</string>
    <string name="cpp_wizard_finish">完成</string>
-    <string name="cpp_wizard_mode_simple">简单型</string>
+    <string name="cpp_mode_simple">简单型</string>
    <string name="cpp_wizard_mode_simple_description">在简单模式下主屏幕上只有基本功能可用。计算结果保留5位小数，角度单位默认为度。</string>
-    <string name="cpp_wizard_mode_engineer">工程模式</string>
+    <string name="cpp_mode_engineer">工程模式</string>
    <string name="cpp_wizard_mode_engineer_description">在工程模式下，主屏幕上可以使用特殊功能。计算结果不四舍五入并以工程表示法表示，角度单位默认为弧度。</string>
    <string name="cpp_restart_wizard">启动向导</string>
    <string name="cpp_wizard_dragbutton_action_end">就是这样！点击按钮来重启向导</string>
--- a/app/src/main/res/values-zh-rTW/text_imported_aosp.xml
+++ b/app/src/main/res/values-zh-rTW/text_imported_aosp.xml
@ -15,6 +15,8 @@
   <string name="cpp_switch">切換</string>
   <string name="cpp_add">新增</string>
   <string name="cpp_mode">模式</string>
+   <string name="cpp_enable">啟用</string>
+   <string name="cpp_other">其他</string>
   <string name="cpp_edit">編輯</string>
   <string name="cpp_delete">刪除</string>
   <string name="cpp_done">完成</string>
--- a/app/src/main/res/values-zh-rTW/text_imported_other1.xml
+++ b/app/src/main/res/values-zh-rTW/text_imported_other1.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources/>
--- a/app/src/main/res/values-zh-rTW/text_microsoft.xml
+++ b/app/src/main/res/values-zh-rTW/text_microsoft.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_appearance">外觀</string>
+   <string name="cpp_number_format">數字格式</string>
+   <string name="cpp_system_language">系統語言</string>
+   <string name="cpp_format">格式</string>
+   <string name="cpp_angles">角度</string>
+   <string name="cpp_examples">範例</string>
+</resources>
--- a/app/src/main/res/values-zh-rTW/text_strings.xml
+++ b/app/src/main/res/values-zh-rTW/text_strings.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="c_app_name">Calculator++</string>
+    <string name="cpp_app_name">Calculator++</string>
    <string name="c_app_name_on_screen">Calculator++（視窗模式）</string>
    <string name="c_result_copied">計算結果已複製至剪貼簿！</string>
    <string name="c_vars_and_constants">變數與常數</string>
@ -14,7 +14,7 @@
    <string name="c_calc_round_result_summary">切換是否四捨五入計算結果</string>
    <string name="c_calc_science_notation_title">永遠使用科學記號</string>
    <string name="c_calc_science_notation_summary">如果啟用，強制只用科學記號表示 (12.34E-12)</string>
-    <string name="p_calc_result_precision_title">計算結果精確度</string>
+    <string name="cpp_precision">計算結果精確度</string>
    <string name="c_save">儲存</string>
    <string name="removal_confirmation">刪除確認</string>
    <string name="c_var_removal_confirmation_question">你確定要刪除變數 \'%s\' 嗎？</string>
@ -30,26 +30,26 @@
    <string name="c_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="cpp_deg">度 (Degrees)</string>
+    <string name="cpp_rad">弧度 (Radians)</string>
+    <string name="cpp_grad">梯度 (Gradians)</string>
+    <string name="cpp_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">十進位 (Decimal)</string>
-    <string name="p_hex">十六進位 (Hexadecimal)</string>
-    <string name="p_oct">八進位 (Octal)</string>
-    <string name="p_bin">二進位 (Binary)</string>
+    <string name="cpp_dec">十進位 (Decimal)</string>
+    <string name="cpp_hex">十六進位 (Hexadecimal)</string>
+    <string name="cpp_oct">八進位 (Octal)</string>
+    <string name="cpp_bin">二進位 (Binary)</string>
    <string name="c_calc_theme">主題風格</string>
-    <string name="p_metro_blue_theme">現代藍</string>
+    <string name="cpp_theme_metro_blue">現代藍</string>
    <string name="p_metro_green_theme">現代綠</string>
    <string name="p_metro_purple_theme">現代紫</string>
-    <string name="p_use_app_theme">App theme</string>
+    <string name="cpp_theme_app">App theme</string>
    <string name="c_calc_result_precision_summary">計算結果值的精確度（不論選項值為多少，所有計算過程都使用最大精確度）</string>
-    <string name="p_grouping_separator_no">沒有撇節符號</string>
-    <string name="p_grouping_separator_apostrophe">撇號 (\')</string>
-    <string name="p_grouping_separator_space">空格 ( )</string>
+    <string name="cpp_thousands_separator_no">沒有撇節符號</string>
+    <string name="cpp_thousands_separator_apostrophe">撇號 (\')</string>
+    <string name="cpp_thousands_separator_space">空格 ( )</string>
    <string name="c_calc_grouping_separator">撇節符號</string>
    <string name="c_calc_grouping_separator_summary">設定撇節符號</string>
    <string name="not_valid_result">目前計算结果無效！</string>
@ -92,8 +92,8 @@
    <string name="preferred_angle_units_message">目前的角度單位 \'%2$s\' 與預設的 \'%1$s\' 不同。忘了改回來？</string>
    <string name="close">關閉</string>
    <string name="open_onscreen_calculator">點擊以視窗模式開啟計算機</string>
-    <string name="prefs_onscreen_title">計算機（獨立視窗）設定</string>
-    <string name="prefs_widget_title">Widget settings</string>
+    <string name="cpp_floating_calculator">計算機（獨立視窗）設定</string>
+    <string name="cpp_widget">Widget settings</string>
    <string name="prefs_onscreen_show_app_icon_title">顯示獨立的圖示（需要重新啟動）</string>
    <string name="prefs_onscreen_show_app_icon_summary">如果啟用，應用程式列表將會顯示第二個圖示</string>
    <string name="cpp_this_change_may_require_reboot">這個變動可能需要重新啟動</string>
@ -114,5 +114,4 @@
    <string name="cpp_clear_history">清除</string>
    <string name="cpp_new_in_version">%1$s 版本的新功能</string>
    <string name="cpp_release_notes_choose_theme">你想要嘗試新的 Material 主題風格嗎？ 從清單中選擇：</string>
-    <string name="cpp_system_language">System language</string>
 </resources>
--- a/Show More
+++ b/Show More