diff --git a/app/src/main/java/org/solovyev/android/calculator/RemovalConfirmationDialog.java b/app/src/main/java/org/solovyev/android/calculator/RemovalConfirmationDialog.java
index 9ffa0644..0d2ace06 100644
--- a/app/src/main/java/org/solovyev/android/calculator/RemovalConfirmationDialog.java
+++ b/app/src/main/java/org/solovyev/android/calculator/RemovalConfirmationDialog.java
@@ -38,8 +38,8 @@ public class RemovalConfirmationDialog {
                 .setCancelable(true)
                 .setTitle(R.string.removal_confirmation)
                 .setMessage(activity.getString(message, name))
-                .setNegativeButton(R.string.c_no, null)
-                .setPositiveButton(R.string.c_yes, new DialogInterface.OnClickListener() {
+                .setNegativeButton(R.string.cpp_no, null)
+                .setPositiveButton(R.string.cpp_yes, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         listener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
diff --git a/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java b/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
index 4c403600..581411ca 100644
--- a/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/wizard/WizardActivity.java
@@ -137,8 +137,8 @@ public class WizardActivity extends BaseActivity implements WizardsAware, Shared
             final AlertDialog.Builder b = new AlertDialog.Builder(this, App.getTheme().alertDialogTheme);
             b.setTitle(R.string.cpp_wizard_finish_confirmation_title).
                     setMessage(R.string.cpp_wizard_finish_confirmation).
-                    setNegativeButton(R.string.c_no, dialogListener).
-                    setPositiveButton(R.string.c_yes, dialogListener).
+                    setNegativeButton(R.string.cpp_no, dialogListener).
+                    setPositiveButton(R.string.cpp_yes, dialogListener).
                     setOnCancelListener(dialogListener);
             dialog = b.create();
             dialog.setOnDismissListener(dialogListener);
diff --git a/app/src/main/res/values-ar/text_strings.xml b/app/src/main/res/values-ar/text_strings.xml
index 2a86b511..0a01b014 100644
--- a/app/src/main/res/values-ar/text_strings.xml
+++ b/app/src/main/res/values-ar/text_strings.xml
@@ -17,8 +17,6 @@
 (12.34E-12)</string>
     <string name="p_calc_result_precision_title">دقة النتيجة</string>
     <string name="c_save">حفظ</string>
-    <string name="c_yes">نعم</string>
-    <string name="c_no">لا</string>
     <string name="removal_confirmation">تأكيد الإزالة</string>
     <string name="c_var_removal_confirmation_question">هل تريد حقاً حذف المتغير \'%s\'؟</string>
     <string name="c_var_name">الاسم</string>
diff --git a/app/src/main/res/values-cs/text_strings.xml b/app/src/main/res/values-cs/text_strings.xml
index cd48457b..c754a2ad 100644
--- a/app/src/main/res/values-cs/text_strings.xml
+++ b/app/src/main/res/values-cs/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Uložit</string>
-    <string name="c_yes">Ano</string>
-    <string name="c_no">Ne</string>
     <string name="removal_confirmation">Potvrzení odebrání</string>
     <string name="c_var_removal_confirmation_question">Opravdu chcete odstranit proměnnou \'%s\'?</string>
     <string name="c_var_name">Jméno</string>
diff --git a/app/src/main/res/values-de/text_strings.xml b/app/src/main/res/values-de/text_strings.xml
index 9d2ef350..bcea1c4a 100644
--- a/app/src/main/res/values-de/text_strings.xml
+++ b/app/src/main/res/values-de/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Speichern</string>
-    <string name="c_yes">Ja</string>
-    <string name="c_no">Nein</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>
     <string name="c_var_name">Name</string>
diff --git a/app/src/main/res/values-es/text_strings.xml b/app/src/main/res/values-es/text_strings.xml
index eb9d58ae..1db2f398 100644
--- a/app/src/main/res/values-es/text_strings.xml
+++ b/app/src/main/res/values-es/text_strings.xml
@@ -17,8 +17,6 @@
 (12.34E-12)</string>
     <string name="p_calc_result_precision_title">Precisión del resultado</string>
     <string name="c_save">Grabar</string>
-    <string name="c_yes">Si</string>
-    <string name="c_no">No</string>
     <string name="removal_confirmation">Confirmación de Borrado</string>
     <string name="c_var_removal_confirmation_question">¿Realmente desea borrar la variable \'%s\'?</string>
     <string name="c_var_name">Nombre</string>
diff --git a/app/src/main/res/values-fi/text_strings.xml b/app/src/main/res/values-fi/text_strings.xml
index 598e025c..3ddccc8b 100644
--- a/app/src/main/res/values-fi/text_strings.xml
+++ b/app/src/main/res/values-fi/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Tallenna</string>
-    <string name="c_yes">Kyllä</string>
-    <string name="c_no">Ei</string>
     <string name="removal_confirmation">Poistamisvahvistus</string>
     <string name="c_var_removal_confirmation_question">Haluatko todella poistaa %s muuttujan?</string>
     <string name="c_var_name">Nimi</string>
diff --git a/app/src/main/res/values-fr/text_strings.xml b/app/src/main/res/values-fr/text_strings.xml
index 82b65214..148387e8 100644
--- a/app/src/main/res/values-fr/text_strings.xml
+++ b/app/src/main/res/values-fr/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Enregistrer</string>
-    <string name="c_yes">Oui</string>
-    <string name="c_no">Non</string>
     <string name="removal_confirmation">Confirmation de suppression</string>
     <string name="c_var_removal_confirmation_question">Voulez-vous vraiment supprimer la variable « %s » ?</string>
     <string name="c_var_name">Nom</string>
diff --git a/app/src/main/res/values-it/text_strings.xml b/app/src/main/res/values-it/text_strings.xml
index 2a16bae5..9d206e6b 100644
--- a/app/src/main/res/values-it/text_strings.xml
+++ b/app/src/main/res/values-it/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Salva</string>
-    <string name="c_yes">Sì</string>
-    <string name="c_no">No</string>
     <string name="removal_confirmation">Conferma rimozione</string>
     <string name="c_var_removal_confirmation_question">Vuoi davvero cancellare la variabile \'%s\'?</string>
     <string name="c_var_name">Nome</string>
diff --git a/app/src/main/res/values-ja/text_strings.xml b/app/src/main/res/values-ja/text_strings.xml
index c822f6ce..b680670e 100644
--- a/app/src/main/res/values-ja/text_strings.xml
+++ b/app/src/main/res/values-ja/text_strings.xml
@@ -18,8 +18,6 @@
 	</string>
     <string name="p_calc_result_precision_title">計算結果の有効桁数</string>
     <string name="c_save">保存</string>
-    <string name="c_yes">はい</string>
-    <string name="c_no">いいえ</string>
     <string name="removal_confirmation">削除の確認</string>
     <string name="c_var_removal_confirmation_question">本当に変数 \'%s\' を削除しますか？</string>
     <string name="c_var_name">名前</string>
diff --git a/app/src/main/res/values-nl/text_strings.xml b/app/src/main/res/values-nl/text_strings.xml
index 4d61d4a3..b523d97d 100644
--- a/app/src/main/res/values-nl/text_strings.xml
+++ b/app/src/main/res/values-nl/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Opslaan</string>
-    <string name="c_yes">Ja</string>
-    <string name="c_no">Nee</string>
     <string name="removal_confirmation">Verwijderen bevestigen</string>
     <string name="c_var_removal_confirmation_question">Wilt u echt \'%s\' variabele verwijderen?</string>
     <string name="c_var_name">Naam</string>
diff --git a/app/src/main/res/values-pl/text_strings.xml b/app/src/main/res/values-pl/text_strings.xml
index 123d17bd..681597d5 100644
--- a/app/src/main/res/values-pl/text_strings.xml
+++ b/app/src/main/res/values-pl/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Zapisz</string>
-    <string name="c_yes">Tak</string>
-    <string name="c_no">Nie</string>
     <string name="removal_confirmation">Potwierdzenie usunięcia</string>
     <string name="c_var_removal_confirmation_question">Czy na pewno chcesz usunąć zmienną \'%s\'?</string>
     <string name="c_var_name">Nazwa</string>
diff --git a/app/src/main/res/values-pt-rBR/text_strings.xml b/app/src/main/res/values-pt-rBR/text_strings.xml
index c2604bc6..dbed5a81 100644
--- a/app/src/main/res/values-pt-rBR/text_strings.xml
+++ b/app/src/main/res/values-pt-rBR/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Salvar</string>
-    <string name="c_yes">Sim</string>
-    <string name="c_no">Não</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>
     <string name="c_var_name">Nome</string>
diff --git a/app/src/main/res/values-pt-rPT/text_strings.xml b/app/src/main/res/values-pt-rPT/text_strings.xml
index 2e5b79fa..69034279 100644
--- a/app/src/main/res/values-pt-rPT/text_strings.xml
+++ b/app/src/main/res/values-pt-rPT/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Guardar</string>
-    <string name="c_yes">Sim</string>
-    <string name="c_no">Não</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>
     <string name="c_var_name">Nome</string>
diff --git a/app/src/main/res/values-ru/text_strings.xml b/app/src/main/res/values-ru/text_strings.xml
index 6123d08e..38638832 100644
--- a/app/src/main/res/values-ru/text_strings.xml
+++ b/app/src/main/res/values-ru/text_strings.xml
@@ -18,8 +18,6 @@
 	</string>
     <string name="p_calc_result_precision_title">Точность результата</string>
     <string name="c_save">Сохранить</string>
-    <string name="c_yes">Да</string>
-    <string name="c_no">Нет</string>
     <string name="removal_confirmation">Подтверждение удаления</string>
     <string name="c_var_removal_confirmation_question">Вы действительно хотите удалить переменную \'%s\'?</string>
     <string name="c_var_name">Имя</string>
diff --git a/app/src/main/res/values-tr/text_strings.xml b/app/src/main/res/values-tr/text_strings.xml
index 7cf63014..11d2a7da 100644
--- a/app/src/main/res/values-tr/text_strings.xml
+++ b/app/src/main/res/values-tr/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Kaydet</string>
-    <string name="c_yes">Evet</string>
-    <string name="c_no">Hayır</string>
     <string name="removal_confirmation">Silme onayı</string>
     <string name="c_var_removal_confirmation_question">%s değişkenini silmek istiyor musunuz?</string>
     <string name="c_var_name">İsim</string>
diff --git a/app/src/main/res/values-uk/text_imported_aosp.xml b/app/src/main/res/values-uk/text_imported_aosp.xml
new file mode 100644
index 00000000..694b2f0b
--- /dev/null
+++ b/app/src/main/res/values-uk/text_imported_aosp.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+   <string name="cpp_prefs_vibrate_on_keypress">Вібрація під час дотику</string>
+   <string name="cpp_prefs_auto_rotate_screen">Автоповорот екрана</string>
+   <string name="cpp_language">Мова</string>
+   <string name="cpp_theme">Тема</string>
+   <string name="cpp_theme_light">Світла</string>
+   <string name="cpp_theme_dark">Темна</string>
+   <string name="cpp_prefs_keep_screen_on">Залишати активним</string>
+   <string name="cpp_permission_overlay">Відображати поверх додатків</string>
+   <string name="cpp_yes">Так</string>
+   <string name="cpp_no">Ні</string>
+   <string name="cpp_create">Створити</string>
+   <string name="cpp_close">Закрити</string>
+   <string name="cpp_switch">Змінити користувача</string>
+   <string name="cpp_add">Додати</string>
+   <string name="cpp_edit">Редагувати</string>
+   <string name="cpp_delete">Видалити</string>
+   <string name="cpp_done">Готово</string>
+   <string name="cpp_cancel">Скасувати</string>
+   <string name="cpp_description">Опис</string>
+   <string name="cpp_about">Про</string>
+   <string name="cpp_copy_text">Копіювати в буфер обміну</string>
+   <string name="cpp_text_copied">Текст скопійовано</string>
+   <string name="cpp_name">Ім’я</string>
+   <string name="cpp_settings">Налаштування</string>
+   <string name="cpp_nan">Не число</string>
+   <string name="cpp_error">Помилка</string>
+   <string name="cpp_copy">Копіюв.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/text_strings.xml b/app/src/main/res/values-uk/text_strings.xml
index 0d481596..9e60595e 100644
--- a/app/src/main/res/values-uk/text_strings.xml
+++ b/app/src/main/res/values-uk/text_strings.xml
@@ -18,8 +18,6 @@
 	</string>
     <string name="p_calc_result_precision_title">Точність результату</string>
     <string name="c_save">Зберегти</string>
-    <string name="c_yes">Так</string>
-    <string name="c_no">Ні</string>
     <string name="removal_confirmation">Підтвердження вилучення</string>
     <string name="c_var_removal_confirmation_question">Ви дійсно хочете вилучити змінну \'%s\'?</string>
     <string name="c_var_name">Ім’я</string>
diff --git a/app/src/main/res/values-vi/text_strings.xml b/app/src/main/res/values-vi/text_strings.xml
index f960697f..37a5c8fe 100644
--- a/app/src/main/res/values-vi/text_strings.xml
+++ b/app/src/main/res/values-vi/text_strings.xml
@@ -16,8 +16,6 @@
     <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="c_save">Lưu</string>
-    <string name="c_yes">Có</string>
-    <string name="c_no">Không</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>
     <string name="c_var_name">Tên</string>
diff --git a/app/src/main/res/values-zh-rCN/text_strings.xml b/app/src/main/res/values-zh-rCN/text_strings.xml
index 1ffaaddc..56f662ed 100644
--- a/app/src/main/res/values-zh-rCN/text_strings.xml
+++ b/app/src/main/res/values-zh-rCN/text_strings.xml
@@ -16,8 +16,6 @@
     <string name="c_calc_science_notation_summary">开启此选项，则答案将永远使用科学计数法表示 (例: 12.34E-12)</string>
     <string name="p_calc_result_precision_title">保留小数点后位数</string>
     <string name="c_save">保存</string>
-    <string name="c_yes">是</string>
-    <string name="c_no">否</string>
     <string name="removal_confirmation">确认移除</string>
     <string name="c_var_removal_confirmation_question">您真的要移除变量 \'%s\' 吗?</string>
     <string name="c_var_name">名称</string>
diff --git a/app/src/main/res/values-zh-rTW/text_strings.xml b/app/src/main/res/values-zh-rTW/text_strings.xml
index fb4dc9aa..a899a0a7 100644
--- a/app/src/main/res/values-zh-rTW/text_strings.xml
+++ b/app/src/main/res/values-zh-rTW/text_strings.xml
@@ -16,8 +16,6 @@
     <string name="c_calc_science_notation_summary">如果啟用，強制只用科學記號表示 (12.34E-12)</string>
     <string name="p_calc_result_precision_title">計算結果精確度</string>
     <string name="c_save">儲存</string>
-    <string name="c_yes">是</string>
-    <string name="c_no">否</string>
     <string name="removal_confirmation">刪除確認</string>
     <string name="c_var_removal_confirmation_question">你確定要刪除變數 \'%s\' 嗎？</string>
     <string name="c_var_name">名稱</string>
diff --git a/app/src/main/res/values/text_strings.xml b/app/src/main/res/values/text_strings.xml
index 7127eb9b..0920f54d 100644
--- a/app/src/main/res/values/text_strings.xml
+++ b/app/src/main/res/values/text_strings.xml
@@ -16,8 +16,6 @@
     <string name="c_calc_science_notation_summary">If turned on forces to use only scientific notation of output (12.34E-12)</string>
     <string name="p_calc_result_precision_title">Precision of result</string>
     <string name="c_save">Save</string>
-    <string name="c_yes">Yes</string>
-    <string name="c_no">No</string>
     <string name="removal_confirmation">Removal confirmation</string>
     <string name="c_var_removal_confirmation_question">Do you really want to delete \'%s\' variable?</string>
     <string name="c_var_name">Name</string>