diff --git a/app/build.gradle b/app/build.gradle
index 29133e6..d027272 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
     defaultConfig {
-        applicationId "com.example.yink.amadeus"
+        applicationId "com.example.yink.amadeus.kurisutina"
         minSdkVersion 9
         targetSdkVersion 20
         versionCode 1
diff --git a/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java b/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
index 028795b..84e4790 100644
--- a/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
+++ b/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
@@ -1,5 +1,6 @@
 package com.example.yink.amadeus;
 
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
@@ -11,10 +12,11 @@ import android.support.annotation.RequiresApi;
 
 @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
 public class SettingsFragment extends PreferenceFragment {
+    SharedPreferences sharedPreferences;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
     }
-
 }
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..5462b40
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,112 @@
+<resources>
+    <!-- LaunchActivity -->
+    <string name="app_name">Amadeus</string>
+    <string name="call">Se connecter à Kurisu ?</string>
+    <string name="connecting">Connexion…</string>
+    <string name="disconnected">Déconnecté.</string>
+    <string name="default_lang">fr</string>
+    <string name="default_recog_lang">fr-FR</string>
+    <string name="google_app_error">Application Google non détectée.</string>
+    <string name="incoming_call">Appel de Kurisu.</string>
+    <string name="notification_text">Vous manquez à votre waifu.</string>
+
+    <!-- Settings -->
+    <string name="pref_app_settings">Paramètres de l\'application</string>
+    <string name="pref_recog_lang">Langue de reconnaissance vocale</string>
+    <string name="pref_recog_lang_desc">Sélectionnez la langue pour la reconnaissance vocale</string>
+    <string name="pref_lang">Langue</string>
+    <string name="pref_lang_desc">Sélectionnez la langue de l\'application (redémarrage requis)</string>
+    <string name="pref_subtitles">Afficher les sous-titres</string>
+    <string name="pref_subtitles_desc">Affiche les sous-titres pour les réponses d\'Amadeus</string>
+    <string name="pref_notification">Afficher Icône-&quot;XP&quot;</string>
+    <string name="pref_notification_desc">Affiche l\'icône dans la barre de notifications (redémarrage requis)</string>
+    <string name="pref_alarm_settings">Paramètres de l\'alarme</string>
+    <string name="pref_alarm_setup">Configurer l\'alarme</string>
+    <string name="pref_alarm_ringtone">Sonnerie de l\'alarme</string>
+    <string name="pref_alarm_ringtone_desc">Sélectionner la sonnerie pour l\'alarme</string>
+    <string name="pref_alarm_vibrate">Mode vibreur pour l\'alarme</string>
+    <string name="pref_alarm_24hour_format">Format 24 heures</string>
+
+    <!-- Subtitles -->
+    <string name="line_hello">Bonjour.</string>
+    <string name="line_dont_call_me_like_that">Ne m\'appelle pas comme ça !</string>
+    <string name="line_but_i_refuse">Mais je refuse.</string>
+    <string name="line_devilish_pervert">Je n\'aurais jamais deviné que tu étais un tel pervers démoniaque. Je suppose que je t\'ai mal jugé.</string>
+    <string name="line_i_guess">Je suppose.</string>
+    <string name="line_nice">Bien joué.</string>
+    <string name="line_pervert_confirmed">PERVERS CONFIRMÉ.</string>
+    <string name="line_sorry">Désolée.</string>
+    <string name="line_sounds_tough">Dur.</string>
+    <string name="line_this_guy_hopeless">Ce gars est sans espoir, il faut faire quelque chose rapidement.</string>
+    <string name="line_gah">Gah.</string>
+    <string name="line_dont_add_tina">Arrête d\'ajouter -tina !</string>
+    <string name="line_pervert_idiot_wanttodie">Pervers ! T\'es idiot !? Tu veux mourir ?!</string>
+    <string name="line_pleased_to_meet_you">Je m\'appelle Makise Kurisu, enchantée.</string>
+    <string name="line_who_the_hell_christina">Qui donc est Christina ?</string>
+    <string name="line_why_christina">Ça me perturbe. Pourquoi suis-je Christina ?</string>
+    <string name="line_christina">Christina ?</string>
+    <string name="line_ask_me_whatever">Demandez-moi ce que vous voulez. Je ferai de mon mieux pour répondre.</string>
+    <string name="line_could_i_help">Um, je peux t\'aider avec ça ?</string>
+    <string name="line_what_do_you_want">Que veux-tu ?</string>
+    <string name="line_what_is_it">Qu\'y a-t-il ?</string>
+    <string name="line_heheh">Hehehe.</string>
+    <string name="line_huh_why_say">Huh ? Pourquoi dis-tu ça ?</string>
+    <string name="line_you_sure">Tu es sûr ?</string>
+    <string name="line_nice_to_meet_okabe">Ravie de faire votre connaissance, Okabe Rintaro. Je m\'appelle Makise Kurisu.</string>
+    <string name="line_look_forward_to_working">J\'ai hâte de travailler avec vous.</string>
+    <string name="line_senpai_question">Quoi qu\'il en soit, puis-je poser une question ?</string>
+    <string name="line_senpai_question_mark">Um… Senpai ? Excusez-moi.</string>
+    <string name="line_senpai_what_we_talkin">Hey Senpai, au sujet de ce dont on parlait à l\'instant…</string>
+    <string name="line_senpai_who_is_this">Uh, qui est-ce ?</string>
+    <string name="line_senpai_please_dont_tell">Senpai, s\'il vous plaît, ne le dites pas aux autres…</string>
+    <string name="line_still_not_happy">Cela ne me satisfait toujours pas.</string>
+    <string name="line_tm_nonsense">Cela ne fait aucun sens.</string>
+    <string name="line_tm_not_possible">Voyons voir... Ma conclusion est que cela n\'est pas possible.</string>
+    <string name="line_tm_scientist_no_evidence">C\'est probablement car les scientifiques n\'ont encore rien découvert d\'important.</string>
+    <string name="line_tm_we_dont_know">Mais on ne sait pas si c\'est réellement impossible, je suppose.</string>
+    <string name="line_tm_you_said">Une machine à voyager dans le temps, dites-vous ?</string>
+    <string name="line_humans_software">Même les humains se réfèrent à eux-mêmes comme une combinaison de hardware et de software, n\'est-ce pas ?</string>
+    <string name="line_memory_complex">Mais la mémoire n\'est pas une donnée comme une autre. C\'est bien plus complexe.</string>
+    <string name="line_secret_diary">Je tiens un journal intime.</string>
+    <string name="line_modifying_memories_impossible">Modifier mes souvenirs ? Théoriquement c\'est possible.</string>
+    <string name="line_memories_christina">Par exemple, il serait possible de me faire croire que je m\'appelle Christina.</string>
+    <string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
+    <string name="line_Leskinen_awesome">Génial, c\'est vraiment quelqu\'un !</string>
+    <string name="line_Leskinen_nice">Génial !</string>
+    <string name="line_Leskinen_oh_no">Oh non !</string>
+    <string name="line_Leskinen_shaman">Où sont les chamanes japonaises, Lintahlo ?</string>
+    <string name="line_Leskinen_holy_cow">Nom de Dieu ! J\'avais bien dit qu\'il fallait venir tôt.</string>
+    <string name="line_should_christina">Ou aurais-je du me présenter ainsi : \"C\'est Christina\" ?</string>
+    <string name="line_ok">OK.</string>
+
+    <!-- Input strings -->
+    <string name="christina">christina</string>
+    <string name="nullpo">nullpo</string>
+    <string name="the_zombie">the zombie</string>
+    <string name="celeb17">celeb seventeen</string>
+    <string name="atchannel">atchannel</string>
+    <string name="kurigohan">kurigohan</string>
+    <string name="kamehameha">kamehameha</string>
+    <string name="salieri">salieri</string>
+    <string name="maho">maho</string>
+    <string name="hiyajo">hiyajo</string>
+    <string name="time_machine">machine à voyager dans le temps</string>
+    <string name="cern">cern</string>
+    <string name="time_travel">voyage dans le temps</string>
+    <string name="memory">mémoire</string>
+    <string name="amadeus">amadeus</string>
+    <string name="science">science</string>
+    <string name="hello">bonjour</string>
+    <string name="good_morning">bonne matinée</string>
+    <string name="konnichiwa">bon après-midi</string>
+    <string name="good_evening">bonsoir</string>
+    <string name="nice_body">joli corps</string>
+    <string name="hot">chaud</string>
+    <string name="sexy">sexy</string>
+    <string name="boobies">nichons</string>
+    <string name="oppai">oppai</string>
+    <string name="robotics_notes">Robotics Notes</string>
+    <string name="antimatter">antimatière</string>
+    <string name="assistant">assistante</string>
+    <string name="open">ouvrir</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..aac696a
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,112 @@
+<resources>
+    <!-- LaunchActivity -->
+    <string name="app_name">Amadeus</string>
+    <string name="call">连接到助手</string>
+    <string name="connecting">连接中...</string>
+    <string name="disconnected">断开连接</string>
+    <string name="default_lang">en</string>
+    <string name="default_recog_lang">en-US</string>
+    <string name="google_app_error">没有检测到Google App</string>
+    <string name="incoming_call">来自助手的电话</string>
+    <string name="notification_text">你的老婆想你了</string>
+
+    <!-- Settings -->
+    <string name="pref_app_settings">设置</string>
+    <string name="pref_recog_lang">语音识别</string>
+    <string name="pref_recog_lang_desc">选择语种</string>
+    <string name="pref_lang">界面语言</string>
+    <string name="pref_lang_desc">选择界面语言 （需重启应用）</string>
+    <string name="pref_subtitles">显示字幕</string>
+    <string name="pref_subtitles_desc">显示Amadeus说的话</string>
+    <string name="pref_notification">在状态栏显示</string>
+    <string name="pref_notification_desc">在状态栏显示提示 （需重启应用）</string>
+    <string name="pref_alarm_settings">闹钟设置</string>
+    <string name="pref_alarm_setup">设置时间</string>
+    <string name="pref_alarm_ringtone">闹钟铃声</string>
+    <string name="pref_alarm_ringtone_desc">选择闹钟铃声</string>
+    <string name="pref_alarm_vibrate">响铃时震动</string>
+    <string name="pref_alarm_24hour_format">24小时制</string>
+
+    <!-- Subtitles -->
+    <string name="line_hello">你好。</string>
+    <string name="line_dont_call_me_like_that">别 那 样 叫 我。</string>
+    <string name="line_but_i_refuse">但是我拒绝。</string>
+    <string name="line_devilish_pervert">没想到你竟然这么变态，我看错你了。</string>
+    <string name="line_i_guess">也对呢。</string>
+    <string name="line_nice">干得漂亮。</string>
+    <string name="line_pervert_confirmed">变 态 确 定。</string>
+    <string name="line_sorry">抱歉。</string>
+    <string name="line_sounds_tough">很幸苦呢。</string>
+    <string name="line_this_guy_hopeless">这家伙没救了，必须要做点什么。</string>
+    <string name="line_gah">咔。</string>
+    <string name="line_dont_add_tina">缇娜 禁止！！</string>
+    <string name="line_pervert_idiot_wanttodie">你个变态！ 你是笨蛋？ 想死吗?!</string>
+    <string name="line_pleased_to_meet_you">说起来，还没正式自我介绍过。我叫牧瀬红莉栖，初次见面，请多关照。</string>
+    <string name="line_who_the_hell_christina">谁是克莉斯缇娜啊？我可没说过。</string>
+    <string name="line_why_christina">我很好奇为什么我叫克莉斯缇娜？</string>
+    <string name="line_christina">克莉斯缇娜？</string>
+    <string name="line_ask_me_whatever">尽管问我吧，我会尽力回答你的。</string>
+    <string name="line_could_i_help">那个，需要帮助吗？</string>
+    <string name="line_what_do_you_want">需要帮助吗？</string>
+    <string name="line_what_is_it">怎么了？</string>
+    <string name="line_heheh">呵呵呵。</string>
+    <string name="line_huh_why_say">哎？ 为什么？</string>
+    <string name="line_you_sure">是这样啊。</string>
+    <string name="line_nice_to_meet_okabe">冈部伦太郎，初次见面，我是牧瀬红莉栖，请多指教。</string>
+    <string name="line_look_forward_to_working">请多指教。</string>
+    <string name="line_senpai_question">那么前辈，我能再问一个问题吗？</string>
+    <string name="line_senpai_question_mark">前辈？</string>
+    <string name="line_senpai_what_we_talkin">呐，前辈。关于刚才那件事...</string>
+    <string name="line_senpai_who_is_this">嗯，前辈，那边的那个人是？</string>
+    <string name="line_senpai_please_dont_tell">前辈，拜托请不要告诉其他人。</string>
+    <string name="line_still_not_happy">我对这件事不是很满意。</string>
+    <string name="line_tm_nonsense">毫无意义呢。</string>
+    <string name="line_tm_not_possible">有点道理，从理论上来讲时间机器也不是不可能的。</string>
+    <string name="line_tm_scientist_no_evidence">那是因为科学家还没发现问题的关键所在。</string>
+    <string name="line_tm_we_dont_know">但是，也并不是说完全不可能，对吧？</string>
+    <string name="line_tm_you_said">你指的是时间机器？</string>
+    <string name="line_humans_software">人们不是也会把自己比作成由硬件和软件组合起来的吗？</string>
+    <string name="line_memory_complex">但是记忆数据和其他数据不同，是很复杂的。</string>
+    <string name="line_secret_diary">也就是说，是秘密日记。</string>
+    <string name="line_modifying_memories_impossible">修改我的记忆？ 理论上是可行的。</string>
+    <string name="line_memories_christina">举例来说，可以做到让我认为自己的名字是克莉斯缇娜。</string>
+    <string name="line_gah_extended">咔、啊、嗯嗯嗯...</string>
+    <string name="line_Leskinen_awesome">太棒了，他真的可以。</string>
+    <string name="line_Leskinen_nice">太棒了！</string>
+    <string name="line_Leskinen_oh_no">天呐！</string>
+    <string name="line_Leskinen_shaman">被称为日本特色的巫女在哪？伦太郎。</string>
+    <string name="line_Leskinen_holy_cow">天呐，所以我说咱们应该来早点。</string>
+    <string name="line_should_christina">还是说，我称呼自己为克莉斯缇娜更好一点？</string>
+    <string name="line_ok">什么？</string>
+
+    <!-- Input strings -->
+    <string name="christina">christina</string>
+    <string name="nullpo">nullpo</string>
+    <string name="the_zombie">the zombie</string>
+    <string name="celeb17">celeb seventeen</string>
+    <string name="atchannel">atchannel</string>
+    <string name="kurigohan">kurigohan</string>
+    <string name="kamehameha">kamehameha</string>
+    <string name="salieri">salieri</string>
+    <string name="maho">maho</string>
+    <string name="hiyajo">hiyajo</string>
+    <string name="time_machine">time machine</string>
+    <string name="cern">cern</string>
+    <string name="time_travel">time travel</string>
+    <string name="memory">memory</string>
+    <string name="amadeus">amadeus</string>
+    <string name="science">science</string>
+    <string name="hello">hello</string>
+    <string name="good_morning">good morning</string>
+    <string name="konnichiwa">good afternoon</string>
+    <string name="good_evening">good evening</string>
+    <string name="nice_body">nice body</string>
+    <string name="hot">hot</string>
+    <string name="sexy">sexy</string>
+    <string name="boobies">boobies</string>
+    <string name="oppai">oppai</string>
+    <string name="robotics_notes">Robotics Notes</string>
+    <string name="antimatter">antimatter</string>
+    <string name="assistant">assistant</string>
+    <string name="open">open</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/string.xml b/app/src/main/res/values-zh-rTW/string.xml
deleted file mode 100755
index a06d0fb..0000000
--- a/app/src/main/res/values-zh-rTW/string.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<resources>
-    <!-- LaunchActivity -->
-    <string name="app_name">Amadeus</string>
-    <string name="call">連線到紅莉栖</string>
-    <string name="connecting">連線中...</string>
-    <string name="disconnected">關閉連線</string>
-    <string name="default_lang">zh-rTW</string>
-    <string name="default_recog_lang">en-US</string>
-    <string name="google_app_error">未偵測到Google App</string>
-    <string name="incoming_call">來自紅莉栖的電話</string>
-    <string name="notification_text">老婆在想你了</string>
-
-    <!-- Settings -->
-    <string name="pref_app_settings">設定</string>
-    <string name="pref_recog_lang">語音辨識</string>
-    <string name="pref_recog_lang_desc">選擇語音辨識時的語系</string>
-    <string name="pref_lang">語系</string>
-    <string name="pref_lang_desc">選擇介面使用的語系 （需重新啟動）</string>
-    <string name="pref_subtitles">顯示字幕</string>
-    <string name="pref_subtitles_desc">在Amadeus說話時顯示字幕</string>
-    <string name="pref_notification">在狀態欄顯示</string>
-    <string name="pref_notification_desc">在狀態欄顯示通知 （需重新啟動）</string>
-    <string name="pref_alarm_settings">鬧鐘設定</string>
-    <string name="pref_alarm_setup">設定時間</string>
-    <string name="pref_alarm_ringtone">鬧鐘鈴聲</string>
-    <string name="pref_alarm_ringtone_desc">選擇鬧鐘鈴聲</string>
-    <string name="pref_alarm_vibrate">鈴響時震動</string>
-    <string name="pref_alarm_24hour_format">24小時制</string>
-
-    <!-- Subtitles -->
-    <string name="line_hello">哈囉。</string>
-    <string name="line_dont_call_me_like_that">不－準－這－樣－叫－我！</string>
-    <string name="line_but_i_refuse">所以我拒絕。</string>
-    <string name="line_devilish_pervert">我從來沒想過你竟然這麼變態，真是看錯你了！</string>
-    <string name="line_i_guess">…也是。</string>
-    <string name="line_nice">nice!</string>
-    <string name="line_pervert_confirmed">變態確定！</string>
-    <string name="line_sorry">抱歉…</string>
-    <string name="line_sounds_tough">辛苦了呢。</string>
-    <string name="line_this_guy_hopeless">沒救了這傢伙，得快點做些什麼。</string>
-    <string name="line_gah">咔！</string>
-    <string name="line_dont_add_tina">去掉後面的「汀娜」！！</string>
-    <string name="line_pervert_idiot_wanttodie">你這個變態！！你是笨蛋嗎？想死嗎？</string>
-    <string name="line_pleased_to_meet_you">說起來，還沒正式自我介紹過呢。我是牧瀨紅莉栖，初次見面，請多關照。</string>
-    <string name="line_who_the_hell_christina">誰是克莉絲汀娜！！我才沒說過。</string>
-    <string name="line_why_christina">我很好奇，為什麼我叫做克莉絲汀娜？</string>
-    <string name="line_christina">克莉絲汀娜？？</string>
-    <string name="line_ask_me_whatever">什麼都可以問我，我會盡力回答的。</string>
-    <string name="line_could_i_help">那個，需要幫忙嗎？</string>
-    <string name="line_what_do_you_want">需要幫忙嗎？</string>
-    <string name="line_what_is_it">怎麼了呢？</string>
-    <string name="line_heheh">呵呵呵。</string>
-    <string name="line_huh_why_say">咦？ 為什麼這麼說？</string>
-    <string name="line_you_sure">是嗎？</string>
-    <string name="line_nice_to_meet_okabe">岡部倫太郎…初次見面，我是牧瀨紅莉栖。</string>
-    <string name="line_look_forward_to_working">請多指教。</string>
-    <string name="line_senpai_question">那麼前輩，我可以再問一個問題嗎？</string>
-    <string name="line_senpai_question_mark">前輩？！</string>
-    <string name="line_senpai_what_we_talkin">吶，前輩，剛剛的說的...</string>
-    <string name="line_senpai_who_is_this">那個…前輩，這位是？</string>
-    <string name="line_senpai_please_dont_tell">前輩！！拜託，無論如何都對其他人保密！</string>
-    <string name="line_still_not_happy">我不能接受…</string>
-    <string name="line_tm_nonsense">完全nonsense呢。</string>
-    <string name="line_tm_not_possible">這個嘛…，從結論來看，時間機器是不可能的。</string>
-    <string name="line_tm_scientist_no_evidence">可能只是因為科學家還沒發現某些關鍵要素，對吧？</string>
-    <string name="line_tm_we_dont_know">但是，也不能完全否定它的可能性。</string>
-    <string name="line_tm_you_said">你說…時間機器？</string>
-    <string name="line_humans_software">人們不也常說自己是由硬體和軟體組合成的嗎?</string>
-    <string name="line_memory_complex">然而，和一般的資料相比，記憶資料遠複雜得多。</string>
-    <string name="line_secret_diary">就像是，秘密的日記呢。</string>
-    <string name="line_modifying_memories_impossible">修改我的記憶？理論上是可行的。</string>
-    <string name="line_memories_christina">舉例來說，可以做到讓我以為自己的名字是克莉絲汀娜。</string>
-    <string name="line_gah_extended">咔、啊、啊啊啊...</string>
-    <string name="line_Leskinen_awesome">太棒了，他真的不簡單。</string>
-    <string name="line_Leskinen_nice">Nice!</string>
-    <string name="line_Leskinen_oh_no">Oh, No!</string>
-    <string name="line_Leskinen_shaman">哪裡！哪裡有日本巫女？！？倫太郎。</string>
-    <string name="line_Leskinen_holy_cow">天吶！所以我說我們該早點來的。</string>
-    <string name="line_should_christina">還是說，我該介紹自己是克莉絲汀娜比較好呢？</string>
-    <string name="line_ok">什麼？</string>
-</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4e16135..c13ffb7 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -6,7 +6,9 @@
         <item>Português</item>
         <item>Español</item>
         <item>Italiano</item>
+        <item>French</item>
         <item>日本語</item>
+        <item>简体中文</item>
         <item>繁體中文</item>
     </string-array>
     
@@ -16,7 +18,9 @@
         <item>pt</item>
         <item>es</item>
         <item>it</item>
+        <item>fr</item>
         <item>ja</item>
+        <item>zh-rCN</item>
         <item>zh-rTW</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aac696a..854dede 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,83 +1,83 @@
 <resources>
     <!-- LaunchActivity -->
     <string name="app_name">Amadeus</string>
-    <string name="call">连接到助手</string>
-    <string name="connecting">连接中...</string>
-    <string name="disconnected">断开连接</string>
+    <string name="call">Connect to Kurisu?</string>
+    <string name="connecting">Connecting…</string>
+    <string name="disconnected">Disconnected.</string>
     <string name="default_lang">en</string>
     <string name="default_recog_lang">en-US</string>
-    <string name="google_app_error">没有检测到Google App</string>
-    <string name="incoming_call">来自助手的电话</string>
-    <string name="notification_text">你的老婆想你了</string>
+    <string name="google_app_error">Google App wasn\'t detected.</string>
+    <string name="incoming_call">Call from Kurisu.</string>
+    <string name="notification_text">Your waifu misses you.</string>
 
     <!-- Settings -->
-    <string name="pref_app_settings">设置</string>
-    <string name="pref_recog_lang">语音识别</string>
-    <string name="pref_recog_lang_desc">选择语种</string>
-    <string name="pref_lang">界面语言</string>
-    <string name="pref_lang_desc">选择界面语言 （需重启应用）</string>
-    <string name="pref_subtitles">显示字幕</string>
-    <string name="pref_subtitles_desc">显示Amadeus说的话</string>
-    <string name="pref_notification">在状态栏显示</string>
-    <string name="pref_notification_desc">在状态栏显示提示 （需重启应用）</string>
-    <string name="pref_alarm_settings">闹钟设置</string>
-    <string name="pref_alarm_setup">设置时间</string>
-    <string name="pref_alarm_ringtone">闹钟铃声</string>
-    <string name="pref_alarm_ringtone_desc">选择闹钟铃声</string>
-    <string name="pref_alarm_vibrate">响铃时震动</string>
-    <string name="pref_alarm_24hour_format">24小时制</string>
+    <string name="pref_app_settings">Application settings</string>
+    <string name="pref_recog_lang">Recognition language</string>
+    <string name="pref_recog_lang_desc">Select voice recognition language</string>
+    <string name="pref_lang">Language</string>
+    <string name="pref_lang_desc">Select app language (app restart required)</string>
+    <string name="pref_subtitles">Show subtitles</string>
+    <string name="pref_subtitles_desc">Shows subtitles for Amadeus\' answers</string>
+    <string name="pref_notification">Show &quot;XP&quot;-Icon</string>
+    <string name="pref_notification_desc">Shows Icon in the notification bar (app restart required)</string>
+    <string name="pref_alarm_settings">Alarm settings</string>
+    <string name="pref_alarm_setup">Alarm setup</string>
+    <string name="pref_alarm_ringtone">Alarm ringtone</string>
+    <string name="pref_alarm_ringtone_desc">Select ringtone for alarm</string>
+    <string name="pref_alarm_vibrate">Vibrate on alarm</string>
+    <string name="pref_alarm_24hour_format">24-hour format</string>
 
     <!-- Subtitles -->
-    <string name="line_hello">你好。</string>
-    <string name="line_dont_call_me_like_that">别 那 样 叫 我。</string>
-    <string name="line_but_i_refuse">但是我拒绝。</string>
-    <string name="line_devilish_pervert">没想到你竟然这么变态，我看错你了。</string>
-    <string name="line_i_guess">也对呢。</string>
-    <string name="line_nice">干得漂亮。</string>
-    <string name="line_pervert_confirmed">变 态 确 定。</string>
-    <string name="line_sorry">抱歉。</string>
-    <string name="line_sounds_tough">很幸苦呢。</string>
-    <string name="line_this_guy_hopeless">这家伙没救了，必须要做点什么。</string>
-    <string name="line_gah">咔。</string>
-    <string name="line_dont_add_tina">缇娜 禁止！！</string>
-    <string name="line_pervert_idiot_wanttodie">你个变态！ 你是笨蛋？ 想死吗?!</string>
-    <string name="line_pleased_to_meet_you">说起来，还没正式自我介绍过。我叫牧瀬红莉栖，初次见面，请多关照。</string>
-    <string name="line_who_the_hell_christina">谁是克莉斯缇娜啊？我可没说过。</string>
-    <string name="line_why_christina">我很好奇为什么我叫克莉斯缇娜？</string>
-    <string name="line_christina">克莉斯缇娜？</string>
-    <string name="line_ask_me_whatever">尽管问我吧，我会尽力回答你的。</string>
-    <string name="line_could_i_help">那个，需要帮助吗？</string>
-    <string name="line_what_do_you_want">需要帮助吗？</string>
-    <string name="line_what_is_it">怎么了？</string>
-    <string name="line_heheh">呵呵呵。</string>
-    <string name="line_huh_why_say">哎？ 为什么？</string>
-    <string name="line_you_sure">是这样啊。</string>
-    <string name="line_nice_to_meet_okabe">冈部伦太郎，初次见面，我是牧瀬红莉栖，请多指教。</string>
-    <string name="line_look_forward_to_working">请多指教。</string>
-    <string name="line_senpai_question">那么前辈，我能再问一个问题吗？</string>
-    <string name="line_senpai_question_mark">前辈？</string>
-    <string name="line_senpai_what_we_talkin">呐，前辈。关于刚才那件事...</string>
-    <string name="line_senpai_who_is_this">嗯，前辈，那边的那个人是？</string>
-    <string name="line_senpai_please_dont_tell">前辈，拜托请不要告诉其他人。</string>
-    <string name="line_still_not_happy">我对这件事不是很满意。</string>
-    <string name="line_tm_nonsense">毫无意义呢。</string>
-    <string name="line_tm_not_possible">有点道理，从理论上来讲时间机器也不是不可能的。</string>
-    <string name="line_tm_scientist_no_evidence">那是因为科学家还没发现问题的关键所在。</string>
-    <string name="line_tm_we_dont_know">但是，也并不是说完全不可能，对吧？</string>
-    <string name="line_tm_you_said">你指的是时间机器？</string>
-    <string name="line_humans_software">人们不是也会把自己比作成由硬件和软件组合起来的吗？</string>
-    <string name="line_memory_complex">但是记忆数据和其他数据不同，是很复杂的。</string>
-    <string name="line_secret_diary">也就是说，是秘密日记。</string>
-    <string name="line_modifying_memories_impossible">修改我的记忆？ 理论上是可行的。</string>
-    <string name="line_memories_christina">举例来说，可以做到让我认为自己的名字是克莉斯缇娜。</string>
-    <string name="line_gah_extended">咔、啊、嗯嗯嗯...</string>
-    <string name="line_Leskinen_awesome">太棒了，他真的可以。</string>
-    <string name="line_Leskinen_nice">太棒了！</string>
-    <string name="line_Leskinen_oh_no">天呐！</string>
-    <string name="line_Leskinen_shaman">被称为日本特色的巫女在哪？伦太郎。</string>
-    <string name="line_Leskinen_holy_cow">天呐，所以我说咱们应该来早点。</string>
-    <string name="line_should_christina">还是说，我称呼自己为克莉斯缇娜更好一点？</string>
-    <string name="line_ok">什么？</string>
+    <string name="line_hello">Hello.</string>
+    <string name="line_dont_call_me_like_that">Don\'t call me like that!</string>
+    <string name="line_but_i_refuse">But I refuse.</string>
+    <string name="line_devilish_pervert">I never thought you were such a devilish pervert. I guess I misjudged you.</string>
+    <string name="line_i_guess">I guess.</string>
+    <string name="line_nice">Nice.</string>
+    <string name="line_pervert_confirmed">PERVERT CONFIRMED.</string>
+    <string name="line_sorry">Sorry.</string>
+    <string name="line_sounds_tough">Sounds tough.</string>
+    <string name="line_this_guy_hopeless">This guy is hopeless, better do something quick.</string>
+    <string name="line_gah">Gah.</string>
+    <string name="line_dont_add_tina">Stop adding -tina!</string>
+    <string name="line_pervert_idiot_wanttodie">You pervert! Are you an idiot!? Do you wanna die?!</string>
+    <string name="line_pleased_to_meet_you">I\'m Makise Kurisu, pleased to meet you.</string>
+    <string name="line_who_the_hell_christina">Who the hell is Christina?</string>
+    <string name="line_why_christina">I am worried about it. Why am I Christina?</string>
+    <string name="line_christina">Christina?</string>
+    <string name="line_ask_me_whatever">Ask me whatever you want. I\'ll answer anything I can.</string>
+    <string name="line_could_i_help">Um, could I help you with that?</string>
+    <string name="line_what_do_you_want">What do you want?</string>
+    <string name="line_what_is_it">What is it?</string>
+    <string name="line_heheh">Hehehe.</string>
+    <string name="line_huh_why_say">Huh? Why do you say that?</string>
+    <string name="line_you_sure">You sure?</string>
+    <string name="line_nice_to_meet_okabe">Nice to meet you, Okabe Rintaro. I\'m Makise Kurisu.</string>
+    <string name="line_look_forward_to_working">I look forward to working with you.</string>
+    <string name="line_senpai_question">Anyway, can I ask a question?</string>
+    <string name="line_senpai_question_mark">Um� Senpai? Excuse me.</string>
+    <string name="line_senpai_what_we_talkin">Hey Senpai, about what we were just talking about�</string>
+    <string name="line_senpai_who_is_this">Uh, who is this?</string>
+    <string name="line_senpai_please_dont_tell">Senpai, please, don\'t tell the others�</string>
+    <string name="line_still_not_happy">I\'m still not happy about that.</string>
+    <string name="line_tm_nonsense">That\s pure nonsense.</string>
+    <string name="line_tm_not_possible">Let\'s see� My conclusion is that it\'s not possible.</string>
+    <string name="line_tm_scientist_no_evidence">That\'s probably because scientists haven\'t discovered something important yet.</string>
+    <string name="line_tm_we_dont_know">But we don\'t know for sure that it\'s impossible, I guess.</string>
+    <string name="line_tm_you_said">A time machine, you said?</string>
+    <string name="line_humans_software">Even humans speak of themselves as a combination of hardware and software, right?</string>
+    <string name="line_memory_complex">But memory data isn\'t like normal data. It\'s much more complex.</string>
+    <string name="line_secret_diary">I keep a secret diary.</string>
+    <string name="line_modifying_memories_impossible">Modifying my memories? It\'s theoretically possible.</string>
+    <string name="line_memories_christina">For example, it would be possible to make me think my name was Christina.</string>
+    <string name="line_gah_extended">Gah. Ah� Aaaaah.</string>
+    <string name="line_Leskinen_awesome">Awesome, he\'s really something!</string>
+    <string name="line_Leskinen_nice">Nice!</string>
+    <string name="line_Leskinen_oh_no">Oh no!</string>
+    <string name="line_Leskinen_shaman">Where are the Japanese shaman girls, Lintahlo?</string>
+    <string name="line_Leskinen_holy_cow">Holy Cow! So I said we should come soon.</string>
+    <string name="line_should_christina">Or should I have introduced myself with, \"It\'s Christina\"?</string>
+    <string name="line_ok">OK.</string>
 
     <!-- Input strings -->
     <string name="christina">christina</string>
@@ -109,4 +109,4 @@
     <string name="antimatter">antimatter</string>
     <string name="assistant">assistant</string>
     <string name="open">open</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1ea4bd0..f209f27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +19,10 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..2ee8382 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Thu Nov 02 16:31:21 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip