diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 358764af..deb1bcdf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -112,11 +112,11 @@
 
         <activity
             android:name=".variables.VariablesActivity"
-            android:label="@string/c_vars_and_constants" />
+            android:label="@string/cpp_vars_and_constants" />
 
         <activity
             android:name=".variables.VariablesActivity$Dialog"
-            android:label="@string/c_vars_and_constants"
+            android:label="@string/cpp_vars_and_constants"
             android:theme="@style/Cpp.Theme.Dialog" />
 
         <activity
@@ -146,7 +146,7 @@
         <activity
             android:name=".floating.FloatingCalculatorActivity"
             android:icon="@drawable/ic_launcher_window"
-            android:label="@string/c_app_name_on_screen"
+            android:label="@string/cpp_app_name_on_screen"
             android:launchMode="singleInstance"
             android:theme="@style/Cpp.Theme.Translucent">
 
diff --git a/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java b/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java
index f6dc38a0..cd574fa1 100644
--- a/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java
+++ b/app/src/main/java/org/solovyev/android/calculator/FragmentTab.java
@@ -38,7 +38,7 @@ public enum FragmentTab {
 
     history(RecentHistoryFragment.class, R.string.cpp_history_tab_recent),
     saved_history(SavedHistoryFragment.class, R.string.cpp_history_tab_saved),
-    variables(VariablesFragment.class, R.string.c_vars_and_constants),
+    variables(VariablesFragment.class, R.string.cpp_vars_and_constants),
     functions(FunctionsFragment.class, R.string.c_functions),
     operators(OperatorsFragment.class, R.string.c_operators),
     about(AboutFragment.class, R.string.cpp_about),
diff --git a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
index 38b47ae9..de07169a 100644
--- a/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/functions/BaseFunctionFragment.java
@@ -33,22 +33,45 @@ import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
-import android.view.*;
+import android.view.ContextMenu;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import jscl.math.function.IConstant;
+
 import org.solovyev.android.Check;
-import org.solovyev.android.calculator.*;
+import org.solovyev.android.calculator.AppComponent;
+import org.solovyev.android.calculator.BaseDialogFragment;
+import org.solovyev.android.calculator.Calculator;
+import org.solovyev.android.calculator.Engine;
+import org.solovyev.android.calculator.FloatingCalculatorKeyboard;
+import org.solovyev.android.calculator.Keyboard;
+import org.solovyev.android.calculator.ParseException;
+import org.solovyev.android.calculator.PreparedExpression;
+import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.VariablesRegistry;
 import org.solovyev.android.calculator.keyboard.FloatingKeyboardWindow;
 import org.solovyev.android.calculator.view.EditTextCompat;
 import org.solovyev.common.math.MathRegistry;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
-import java.util.*;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import jscl.math.function.IConstant;
 
 import static org.solovyev.android.calculator.functions.CppFunction.NO_ID;
 
@@ -457,7 +480,7 @@ public abstract class BaseFunctionFragment extends BaseDialogFragment implements
                     if (id == R.id.function_body) {
                         menu.clear();
                         // can't use sub-menus as AlertDialog doesn't support them
-                        menu.add(MENU_CATEGORY, MENU_CONSTANT, Menu.NONE, R.string.c_vars_and_constants).setOnMenuItemClickListener(KeyboardUser.this);
+                        menu.add(MENU_CATEGORY, MENU_CONSTANT, Menu.NONE, R.string.cpp_vars_and_constants).setOnMenuItemClickListener(KeyboardUser.this);
                         menu.add(MENU_CATEGORY, MENU_FUNCTION, Menu.NONE, R.string.c_functions).setOnMenuItemClickListener(KeyboardUser.this);
                         unregisterForContextMenu(bodyView);
                     }
diff --git a/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java b/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java
index ab0d1a80..11043a82 100644
--- a/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/variables/VariablesActivity.java
@@ -26,22 +26,24 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.view.View;
+
 import org.solovyev.android.calculator.App;
 import org.solovyev.android.calculator.BaseActivity;
 import org.solovyev.android.calculator.FragmentTab;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.view.Tabs;
 
+import java.util.Arrays;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Arrays;
 
 public class VariablesActivity extends BaseActivity {
 
     public static final String EXTRA_VARIABLE = "variable";
 
     public VariablesActivity() {
-        super(R.string.c_vars_and_constants);
+        super(R.string.cpp_vars_and_constants);
     }
 
     @Nonnull
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4a2676fd..81316622 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">الآلة الحاسبة++</string>
-    <string name="c_app_name_on_screen">الآلة الحاسبة++ (نمط النافذة)</string>
-    <string name="c_vars_and_constants">المتغيرات والثوابت</string>
+    <string name="cpp_app_name_on_screen">الآلة الحاسبة++ (نمط النافذة)</string>
+    <string name="cpp_vars_and_constants">المتغيرات والثوابت</string>
     <string name="c_plot">رسم الدالّة</string>
     <string name="cpp_precision">دقة النتيجة</string>
     <string name="c_save">حفظ</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f591c910..883caf9c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Kalkulačka ++ (Režim okna)</string>
-    <string name="c_vars_and_constants">Proměnné a Konstanty</string>
+    <string name="cpp_app_name_on_screen">Kalkulačka ++ (Režim okna)</string>
+    <string name="cpp_vars_and_constants">Proměnné a Konstanty</string>
     <string name="c_plot">Vykreslit graf</string>
     <string name="cpp_precision">Přesnost výsledku</string>
     <string name="c_save">Uložit</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d09b1fad..2a7e4c29 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Fenstermodus)</string>
-    <string name="c_vars_and_constants">Variablen und Konstanten</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (Fenstermodus)</string>
+    <string name="cpp_vars_and_constants">Variablen und Konstanten</string>
     <string name="c_plot">Graph zeichnen</string>
     <string name="cpp_precision">Genauigkeit des Ergebnisses</string>
     <string name="c_save">Speichern</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 72a48d09..95b1958f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculadora++</string>
-    <string name="c_app_name_on_screen">Calculadora++ (Modo ventana)</string>
-    <string name="c_vars_and_constants">Variables y Constantes</string>
+    <string name="cpp_app_name_on_screen">Calculadora++ (Modo ventana)</string>
+    <string name="cpp_vars_and_constants">Variables y Constantes</string>
     <string name="c_plot">Trazar gráfico</string>
     <string name="cpp_precision">Precisión del resultado</string>
     <string name="c_save">Grabar</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 42757f2c..ee03deca 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Laskin++</string>
-    <string name="c_app_name_on_screen">Laskin++ (ikkuna-tilassa)</string>
-    <string name="c_vars_and_constants">Muuttujien ja vakioiden</string>
+    <string name="cpp_app_name_on_screen">Laskin++ (ikkuna-tilassa)</string>
+    <string name="cpp_vars_and_constants">Muuttujien ja vakioiden</string>
     <string name="c_plot">Kaavion tulostamisessa</string>
     <string name="cpp_precision">Tarkka tulos</string>
     <string name="c_save">Tallenna</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 25411455..bc3cb9d6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (mode fenêtre)</string>
-    <string name="c_vars_and_constants">Variables et constantes</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (mode fenêtre)</string>
+    <string name="cpp_vars_and_constants">Variables et constantes</string>
     <string name="c_plot">Tracer le graphe</string>
     <string name="cpp_precision">Précision du résultat</string>
     <string name="c_save">Enregistrer</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3bd8cab5..18892e5e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calcolatrice++</string>
-    <string name="c_app_name_on_screen">Calcolatrice++ (Modalità finestra)</string>
-    <string name="c_vars_and_constants">Variabili e costanti</string>
+    <string name="cpp_app_name_on_screen">Calcolatrice++ (Modalità finestra)</string>
+    <string name="cpp_vars_and_constants">Variabili e costanti</string>
     <string name="c_plot">Plot grafico</string>
     <string name="cpp_precision">Precisione del risultato</string>
     <string name="c_save">Salva</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ae9b790d..1a3ce096 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (ウィンドウモード)</string>
-    <string name="c_vars_and_constants">変数と定数</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (ウィンドウモード)</string>
+    <string name="cpp_vars_and_constants">変数と定数</string>
     <string name="c_plot">グラフをプロット</string>
     <string name="cpp_precision">計算結果の有効桁数</string>
     <string name="c_save">保存</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2b5f3032..0b0cd335 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-    <string name="c_vars_and_constants">Variabelen en constanten</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (Window mode)</string>
+    <string name="cpp_vars_and_constants">Variabelen en constanten</string>
     <string name="c_plot">Uitzetten van grafiek</string>
     <string name="cpp_precision">Nauwkeurigheid van resultaat</string>
     <string name="c_save">Opslaan</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4be677e4..d10ca873 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (tryb okna)</string>
-    <string name="c_vars_and_constants">Zmienne i stałe</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (tryb okna)</string>
+    <string name="cpp_vars_and_constants">Zmienne i stałe</string>
     <string name="c_plot">Stwórz wykres</string>
     <string name="cpp_precision">Dokładność wyniku</string>
     <string name="c_save">Zapisz</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2f8022d2..8950ee66 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Modo Janela)</string>
-    <string name="c_vars_and_constants">Variáveis e constantes</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (Modo Janela)</string>
+    <string name="cpp_vars_and_constants">Variáveis e constantes</string>
     <string name="c_plot">Desenhar o gráfico</string>
     <string name="cpp_precision">Precisão do resultado</string>
     <string name="c_save">Salvar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 68f99055..ba87abe0 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Modo de Janela)</string>
-    <string name="c_vars_and_constants">Variáveis e Constantes</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (Modo de Janela)</string>
+    <string name="cpp_vars_and_constants">Variáveis e Constantes</string>
     <string name="c_plot">Desenhar gráfico</string>
     <string name="cpp_precision">Precisão do resultado</string>
     <string name="c_save">Guardar</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ef2bde72..99fbe199 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Калькулятор++</string>
-    <string name="c_app_name_on_screen">Калькулятор++ (В отдельном окне)</string>
-    <string name="c_vars_and_constants">Переменные и константы</string>
+    <string name="cpp_app_name_on_screen">Калькулятор++ (В отдельном окне)</string>
+    <string name="cpp_vars_and_constants">Переменные и константы</string>
     <string name="c_plot">Построить график</string>
     <string name="cpp_precision">Точность</string>
     <string name="c_save">Сохранить</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e9719bb4..bc975f27 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Pencere modu)</string>
-    <string name="c_vars_and_constants">Değişkenler ve sabitler</string>
+    <string name="cpp_app_name_on_screen">Calculator++ (Pencere modu)</string>
+    <string name="cpp_vars_and_constants">Değişkenler ve sabitler</string>
     <string name="c_plot">Grafik Çiz</string>
     <string name="cpp_precision">Sonuç hassasiyeti</string>
     <string name="c_save">Kaydet</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 66791e00..ee214ec2 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Калькулятор++</string>
-    <string name="c_app_name_on_screen">Калькулятор + + (віконний режим)</string>
-    <string name="c_vars_and_constants">Змінні та константи</string>
+    <string name="cpp_app_name_on_screen">Калькулятор + + (віконний режим)</string>
+    <string name="cpp_vars_and_constants">Змінні та константи</string>
     <string name="c_plot">Побудувати графік</string>
     <string name="cpp_precision">Точність результату</string>
     <string name="c_save">Зберегти</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 5e3da880..18342307 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <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_vars_and_constants">Biến và hằng</string>
+    <string name="cpp_app_name_on_screen">Máy tính ++ (chế độ cửa sổ)</string>
+    <string name="cpp_vars_and_constants">Biến và hằng</string>
     <string name="c_plot">Vẽ đồ thị</string>
     <string name="cpp_precision">Độ chính xác của kết quả</string>
     <string name="c_save">Lưu</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1ced1c78..c1e28e9d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++（悬浮）</string>
-    <string name="c_vars_and_constants">变量与常数</string>
+    <string name="cpp_app_name_on_screen">Calculator++（悬浮）</string>
+    <string name="cpp_vars_and_constants">变量与常数</string>
     <string name="c_plot">作图</string>
     <string name="cpp_precision">保留小数点后位数</string>
     <string name="c_save">保存</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 78fecee3..6b1b8bc1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
     <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++（視窗模式）</string>
-    <string name="c_vars_and_constants">變數與常數</string>
+    <string name="cpp_app_name_on_screen">Calculator++（視窗模式）</string>
+    <string name="cpp_vars_and_constants">變數與常數</string>
     <string name="c_plot">繪圖</string>
     <string name="cpp_precision">計算結果精確度</string>
     <string name="c_save">儲存</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 68c0e737..0be5eb4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com--><!--Generated by crowdin.net-->
 <resources>
-    <string name="cpp_app_name">Calculator++</string>
-    <string name="c_app_name_on_screen">Calculator++ (Window mode)</string>
-    <string name="c_vars_and_constants">Variables And Constants</string>
+    <string name="cpp_app_name" comment="Application name. Shown in the app drawer and tasks manager. Should be short enough to be fully visible on the screen">Calculator++</string>
+    <string name="cpp_app_name_on_screen" comment="Floating calculator name. Shown in the app drawer. Should be short enough to be fully visible on the screen">Calculator++ (Window mode)</string>
+    <string name="cpp_vars_and_constants" comment="Name of `Constants and variables` activity and an entry in the context menu which opens a list of all constants and variables">Variables And Constants</string>
     <string name="c_plot">Plot graph</string>
     <string name="cpp_precision">Precision</string>
     <string name="c_save">Save</string>