diff --git a/resources/src/main/res/values-ar/strings.xml b/resources/src/main/res/values-ar/strings.xml
index 410b22adc9..15db892cf1 100644
--- a/resources/src/main/res/values-ar/strings.xml
+++ b/resources/src/main/res/values-ar/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">هل يجب على المحرر أن يرسم سلسلة ألوان hex؟</string>
   <string name="idepref_editor_word_wrap_title">التفاف النص</string>
   <string name="idepref_editor_word_wrap_summary">استخدام تغليف الكلمات للمحرر</string>
-  <string name="idepref_editor_hide_file_tree_button_title">إخفاء زر شجرة الملفات</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">نقل الزر \"شجرة الملف\" إلى قائمة شريط الأدوات الخاص بالمحرر.</string>
   <string name="idepref_editor_use_magnifier_title">تمكين المكبر</string>
   <string name="idepref_editor_use_magnifier_summary">تكبير النص في موضع المؤشر أثناء اختيار النص في المحرر</string>
   <string name="idepref_editor_title">المحرر</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">تهيئة المشروع</string>
-  <string name="msg_app_launch_failed">فشل في تشغيل التطبيق. راجع سجلات IDE لمزيد من المعلومات.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">التشخيصات مفعلة</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(تجريبي) ما إذا ينبغي تحليل ملفات مصدر جافا بحثا عن أخطاء أم لا.</string>
   <string name="title_reload_color_schemes">إعادة تحميل أنظمة الألوان</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-bn/strings.xml b/resources/src/main/res/values-bn/strings.xml
index c6512f25e1..7540a68d93 100755
--- a/resources/src/main/res/values-bn/strings.xml
+++ b/resources/src/main/res/values-bn/strings.xml
@@ -193,8 +193,6 @@
   <string name="idepref_editor_drawhexcolors_summary">এডিটর কী হেক্স স্ট্রিং-এ রঙ আঁকবে?</string>
   <string name="idepref_editor_word_wrap_title">শব্দ মোড়ানো</string>
   <string name="idepref_editor_word_wrap_summary">সম্পাদকের wordwrap ব্যবহার করুন</string>
-  <string name="idepref_editor_hide_file_tree_button_title">ফাইল ট্রী বাটন হাইড করুন</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">সম্পাদকের টুলবারের ওভারফ্লো মেনুতে \"ফাইল ট্রি\" বোতামটি সরান।</string>
   <string name="idepref_editor_use_magnifier_title">ম্যাগনিফায়ার সক্ষম করুন</string>
   <string name="idepref_editor_use_magnifier_summary">এডিটরে পাঠ্য নির্বাচন করার সময় কার্সার অবস্থানে পাঠ্যকে বড় করুন</string>
   <string name="idepref_editor_title">সম্পাদক</string>
@@ -457,7 +455,7 @@
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">প্রকল্প কনফিগারেশন</string>
-  <string name="msg_app_launch_failed">অ্যাপ্লিকেশন শুরু করতে ব্যর্থ। আরো তথ্য জানার জন্য IDE লগ চেক করুন।</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnostics সক্রিয়</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTAL) জাভা সোর্স ফাইলগুলি ত্রুটির জন্য বিশ্লেষণ করা হোক অথবা নয়।</string>
   <string name="title_reload_color_schemes">Color Scheme পুনরায় লোড করুন</string>
@@ -544,4 +542,5 @@
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-de/strings.xml b/resources/src/main/res/values-de/strings.xml
index 8077128569..950ef6cf24 100644
--- a/resources/src/main/res/values-de/strings.xml
+++ b/resources/src/main/res/values-de/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">Soll der Editor Hex-Farbstrings anzeigen?</string>
   <string name="idepref_editor_word_wrap_title">Zeilenumbruch</string>
   <string name="idepref_editor_word_wrap_summary">Wordwrap des Editor benutzen</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Hide the File Tree button</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Move the \"File Tree\" button into the overflow menu of the editor\'s toolbar.</string>
   <string name="idepref_editor_use_magnifier_title">Magnifier aktivieren</string>
   <string name="idepref_editor_use_magnifier_summary">Vergrößern Sie Text an der Cursorposition, während Sie Text im Editor auswählen</string>
   <string name="idepref_editor_title">Editor</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">Projektkonfiguration</string>
-  <string name="msg_app_launch_failed">Fehler beim Starten der Anwendung. Siehe IDE-Logs für weitere Informationen.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnostik aktiviert</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTELL) Sollen die Java-Quellcodedateien auf Fehler analysiert werden oder nicht.</string>
   <string name="title_reload_color_schemes">Farbschemen neu laden</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-es/strings.xml b/resources/src/main/res/values-es/strings.xml
index d8f2e374dc..815653a6e7 100644
--- a/resources/src/main/res/values-es/strings.xml
+++ b/resources/src/main/res/values-es/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">¿Debe el editor dibujar una cadena de color hex?</string>
   <string name="idepref_editor_word_wrap_title">Ajuste de línea</string>
   <string name="idepref_editor_word_wrap_summary">Usar ajuste de línea del editor</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Ocultar el botón de árbol de archivos</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Move the \"File Tree\" button into the overflow menu of the editor\'s toolbar.</string>
   <string name="idepref_editor_use_magnifier_title">Activar lupa</string>
   <string name="idepref_editor_use_magnifier_summary">Aumenta el texto en la posición del cursor mientras seleccionas el texto en el editor</string>
   <string name="idepref_editor_title">Editor</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">Project configuration</string>
-  <string name="msg_app_launch_failed">Error al iniciar la aplicación. Vea los registros de IDE para más información.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnósticos habilitados</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTAL) Whether the Java source files should be analyzed for errors or not.</string>
   <string name="title_reload_color_schemes">Recargar esquemas de color</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-fr/strings.xml b/resources/src/main/res/values-fr/strings.xml
index c4be07cc42..9e20904103 100644
--- a/resources/src/main/res/values-fr/strings.xml
+++ b/resources/src/main/res/values-fr/strings.xml
@@ -193,8 +193,6 @@ Dernier projet ouvert : \n%s</string>
   <string name="idepref_editor_drawhexcolors_summary">L\'éditeur doit-il afficher les couleurs hex ?</string>
   <string name="idepref_editor_word_wrap_title">Word Wrap</string>
   <string name="idepref_editor_word_wrap_summary">Utiliser le Word Wrap de l\'éditeur </string>
-  <string name="idepref_editor_hide_file_tree_button_title">Cacher le bouton du gestionnaire des fichiers</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Déplace le bouton du gestionnaire des fichiers dans la barre du haut de l\'éditeur.</string>
   <string name="idepref_editor_use_magnifier_title">Activer Magnifier</string>
   <string name="idepref_editor_use_magnifier_summary">Agrandir le texte à la position du curseur lors de la sélection du texte dans l\'éditeur</string>
   <string name="idepref_editor_title">Éditeur</string>
@@ -457,7 +455,7 @@ Dernier projet ouvert : \n%s</string>
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">Project configuration</string>
-  <string name="msg_app_launch_failed">Failed to launch application. See IDE logs for more info.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnostics enabled</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTAL) Whether the Java source files should be analyzed for errors or not.</string>
   <string name="title_reload_color_schemes">Reload color schemes</string>
@@ -544,4 +542,5 @@ Dernier projet ouvert : \n%s</string>
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-hi/strings.xml b/resources/src/main/res/values-hi/strings.xml
index 6adfbac7f6..04bad5ae0f 100644
--- a/resources/src/main/res/values-hi/strings.xml
+++ b/resources/src/main/res/values-hi/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">क्या एडिटर को हेक्स रंग की स्ट्रिंग ड्रा करनी चाहिए?</string>
   <string name="idepref_editor_word_wrap_title">वर्ड रैप</string>
   <string name="idepref_editor_word_wrap_summary">एडिटर के वर्डरैप का प्रयोग करें</string>
-  <string name="idepref_editor_hide_file_tree_button_title">फ़ाइल ट्री बटन छिपाएँ</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">एडिटर टूलबार के ओवरफ़्लो मेनू में \"फ़ाइल ट्री\" बटन को ले जाएँ।</string>
   <string name="idepref_editor_use_magnifier_title">मैग्नीफायर एनेबल करें</string>
   <string name="idepref_editor_use_magnifier_summary">एडिटर में टेक्स्ट का चयन करते समय कर्सर की स्थिति में टेक्स्ट को बड़ा करें</string>
   <string name="idepref_editor_title">एडिटर</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">थीम</string>
   <string name="idepref_general_themeSelector_summary">AndroidIDE के लिए एक थीम चुनें (बदले जाने पर पुनः आरंभ करने की आवश्यकता है)।</string>
   <string name="idepref_general_projectConfig">प्रोजेक्ट कॉन्फ़िगरेशन</string>
-  <string name="msg_app_launch_failed">एप्लिकेशन लॉन्च करने में विफल। अधिक जानकारी के लिए IDE लॉग देखें।</string>
+  <string name="msg_app_launch_failed">लांच विफल रहा. पहले एप्लिकेशन इंस्टॉल करें.</string>
   <string name="idepref_java_diagnosticEnabled_title">Java सोर्स कोड विश्लेषण सक्षम करें</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(प्रायोगिक) जावा स्रोत फ़ाइलों का गलतियों के लिए विश्लेषण किया जाना चाहिए या नहीं।</string>
   <string name="title_reload_color_schemes">कलर स्कीम्स को पुनः लोड करें</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">प्रोजेक्ट डायरेक्टरी पहुंच योग्य नहीं है</string>
   <string name="msg_file_is_not_dir">चुनी गई फ़ाइल एक डायरेक्टरी नहीं है!</string>
   <string name="msg_project_dir_doesnt_exist">प्रोजेक्ट डायरेक्टरी मौजूद नहीं है</string>
+  <string name="msg_files_being_saved">फ़ाइल सहेजने का कार्य पहले से ही प्रगति पर है!</string>
 </resources>
diff --git a/resources/src/main/res/values-in/strings.xml b/resources/src/main/res/values-in/strings.xml
index bb8ce67b67..fbf9f5dd55 100644
--- a/resources/src/main/res/values-in/strings.xml
+++ b/resources/src/main/res/values-in/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">Apakah editor harus menampilkan warna Hex?</string>
   <string name="idepref_editor_word_wrap_title">Word Wrap</string>
   <string name="idepref_editor_word_wrap_summary">Gunakan wordwrap dari editor</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Sembunyikan tombol File Tree</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Pindahkan tombol \"File Tree\" ke dalam menu luapan bilah alat editor.</string>
   <string name="idepref_editor_use_magnifier_title">Aktifkan Magnifier</string>
   <string name="idepref_editor_use_magnifier_summary">Memperbesar teks pada posisi kursor sambil memilih teks di editor</string>
   <string name="idepref_editor_title">Editor</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Tema</string>
   <string name="idepref_general_themeSelector_summary">Pilih tema untuk AndroidIDE (memerlukan restart).</string>
   <string name="idepref_general_projectConfig">Konfigurasi proyek</string>
-  <string name="msg_app_launch_failed">Gagal meluncurkan aplikasi. Lihat log IDE untuk info lebih lanjut.</string>
+  <string name="msg_app_launch_failed">Peluncuran gagal. Instal aplikasinya terlebih dahulu.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnostik diaktifkan</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EKSPERIMENTAL) Apakah file sumber Java harus dianalisis untuk kesalahan atau tidak.</string>
   <string name="title_reload_color_schemes">Muat ulang skema warna</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Direktori proyek tidak dapat diakses</string>
   <string name="msg_file_is_not_dir">File yang dipilih bukan direktori</string>
   <string name="msg_project_dir_doesnt_exist">Direktori proyek tidak ada</string>
+  <string name="msg_files_being_saved">Operasi penyimpanan file sedang berlangsung!</string>
 </resources>
diff --git a/resources/src/main/res/values-pt/strings.xml b/resources/src/main/res/values-pt/strings.xml
index 0580f29c47..c504af8d81 100644
--- a/resources/src/main/res/values-pt/strings.xml
+++ b/resources/src/main/res/values-pt/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">O editor deve desenhar uma string de cor hexadecimal?</string>
   <string name="idepref_editor_word_wrap_title">Quebra de linha</string>
   <string name="idepref_editor_word_wrap_summary">Usa quebra de linha no editor</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Ocultar o botão Lista de Arquivos</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Mover o botão \"Lista de Arquivos\" para o menu flutuante da barra de ferramentas do editor.</string>
   <string name="idepref_editor_use_magnifier_title">Ativar lupa</string>
   <string name="idepref_editor_use_magnifier_summary">Ampliar o texto na posição do cursor ao selecionar o texto no editor</string>
   <string name="idepref_editor_title">Editor</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Tema</string>
   <string name="idepref_general_themeSelector_summary">Selecione um tema para o AndroidIDE (requer reinicialização).</string>
   <string name="idepref_general_projectConfig">Configuração do projeto</string>
-  <string name="msg_app_launch_failed">Falha ao iniciar o aplicativo. Consulte os logs da IDE para obter mais informações.</string>
+  <string name="msg_app_launch_failed">Falha no lançamento. Instale o aplicativo primeiro.</string>
   <string name="idepref_java_diagnosticEnabled_title">Habilitar diagnósticos</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTAL) Os arquivos de código-fonte Java serão analisados para detecção de erros.</string>
   <string name="title_reload_color_schemes">Recarregar esquema de cores</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Diretório de projeto não é acessível</string>
   <string name="msg_file_is_not_dir">Arquivo selecionado não é um diretório</string>
   <string name="msg_project_dir_doesnt_exist">Diretório do projeto não existe</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-ro/strings.xml b/resources/src/main/res/values-ro/strings.xml
index da756d9338..60d17f9416 100644
--- a/resources/src/main/res/values-ro/strings.xml
+++ b/resources/src/main/res/values-ro/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">Should the editor draw hex color string?</string>
   <string name="idepref_editor_word_wrap_title">Word Wrap</string>
   <string name="idepref_editor_word_wrap_summary">Utilizați wordwrap al editorului</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Hide the File Tree button</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Move the \"File Tree\" button into the overflow menu of the editor\'s toolbar.</string>
   <string name="idepref_editor_use_magnifier_title">Activați lupa</string>
   <string name="idepref_editor_use_magnifier_summary">Mărirea textului în poziția cursorului în timp ce selectați textul în editor</string>
   <string name="idepref_editor_title">Editor</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Theme</string>
   <string name="idepref_general_themeSelector_summary">Select a theme for AndroidIDE (requires restart).</string>
   <string name="idepref_general_projectConfig">Configurarea proiectului</string>
-  <string name="msg_app_launch_failed">Nu a reușit să lanseze aplicația. Consultați jurnalele IDE pentru mai multe informații.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Diagnosticarea activată</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(EXPERIMENTAL) Dacă fișierele sursă Java ar trebui să fie analizate pentru erori sau nu.</string>
   <string name="title_reload_color_schemes">Reîncărcarea schemelor de culori</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
   <string name="msg_file_is_not_dir">Selected file is not a directory</string>
   <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-ru/strings.xml b/resources/src/main/res/values-ru/strings.xml
index 176650595a..1a7bde3682 100644
--- a/resources/src/main/res/values-ru/strings.xml
+++ b/resources/src/main/res/values-ru/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">Должен ли редактор отрисовывать HEX строки цветов?</string>
   <string name="idepref_editor_word_wrap_title">Перенос слов</string>
   <string name="idepref_editor_word_wrap_summary">Используйте перенос слов в редакторе</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Скрыть кнопку дерева файлов</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">Переместить кнопку \"Дерево файлов\" в меню переполнения панели инструментов редактора.</string>
   <string name="idepref_editor_use_magnifier_title">Включить лупу</string>
   <string name="idepref_editor_use_magnifier_summary">Увеличьте текст в положении курсора при выделении текста в редакторе</string>
   <string name="idepref_editor_title">Редактор</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Тема</string>
   <string name="idepref_general_themeSelector_summary">Выберите тему оформления для AndroidIDE (требуется перезапуск).</string>
   <string name="idepref_general_projectConfig">Настройки проекта</string>
-  <string name="msg_app_launch_failed">Ошибка запуска приложения. Обратитесь к логам IDE.</string>
+  <string name="msg_app_launch_failed">Ошибка запуска. Сначала установите приложение.</string>
   <string name="idepref_java_diagnosticEnabled_title">Активировать анализ</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(ЭКСПЕРЕМЕНТАЛЬНО) Анализировать исходные файлы Java на предмет ошибок.</string>
   <string name="title_reload_color_schemes">Перезагрузить цветовые схемы</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">Директория проекта недоступна</string>
   <string name="msg_file_is_not_dir">Выбранный файл не является директорией</string>
   <string name="msg_project_dir_doesnt_exist">Директории проекта не существует</string>
+  <string name="msg_files_being_saved">Сохранение файла уже в процессе!</string>
 </resources>
diff --git a/resources/src/main/res/values-tr/strings.xml b/resources/src/main/res/values-tr/strings.xml
index d2d449d6ba..dcec49f70f 100644
--- a/resources/src/main/res/values-tr/strings.xml
+++ b/resources/src/main/res/values-tr/strings.xml
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">Düzenleyici onaltılık renk dizisi çizmeli mi?</string>
   <string name="idepref_editor_word_wrap_title">Kelime kaydırma</string>
   <string name="idepref_editor_word_wrap_summary">Editörün yazı kaydırmasını kullan</string>
-  <string name="idepref_editor_hide_file_tree_button_title">Dosya Ağacı tuşunu gizle</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">\"Dosya Ağacı\" tuşunu düzenleyicinin araç çubuğundaki taşma menüsüne taşı.</string>
   <string name="idepref_editor_use_magnifier_title">Büyüteçi etkinleştir</string>
   <string name="idepref_editor_use_magnifier_summary">Düzenleyicide metin seçerken imleç konumundaki metni büyütün</string>
   <string name="idepref_editor_title">Editör</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">Tema</string>
   <string name="idepref_general_themeSelector_summary">AndroidIDE için bir tema seçin (yeniden başlatma gerekir).</string>
   <string name="idepref_general_projectConfig">Proje yapılandırması</string>
-  <string name="msg_app_launch_failed">Uygulama başlatılamadı. IDE günlüklerini inceleyerek detayları görün.</string>
+  <string name="msg_app_launch_failed">Launch failed. Install the application first.</string>
   <string name="idepref_java_diagnosticEnabled_title">Tanılamalar etkin</string>
   <string name="idepref_java_diagnosticsEnabled_summary">(DENEYSEL) Java kaynak kodu dosyalarının hatalar için analiz edilip edilmeyeceğini seçin.</string>
   <string name="title_reload_color_schemes">Renk şemalarını yeniden yükle</string>
@@ -540,7 +538,8 @@
   <string name="idepref_general_localeSelector_title">Dil</string>
   <string name="idepref_general_localeSelector_summary">AndroidIDE için bir dil seç.</string>
   <string name="locale_system_default">Sistem varsayılanı</string>
-  <string name="msg_project_dir_inaccessible">Project directory is not accessible</string>
-  <string name="msg_file_is_not_dir">Selected file is not a directory</string>
-  <string name="msg_project_dir_doesnt_exist">Project directory does not exist</string>
+  <string name="msg_project_dir_inaccessible">Proje dizini erişilemez</string>
+  <string name="msg_file_is_not_dir">Seçilen dosya bir dizin değil</string>
+  <string name="msg_project_dir_doesnt_exist">Proje dizini mevcut değil</string>
+  <string name="msg_files_being_saved">A file save operation is already in progress!</string>
 </resources>
diff --git a/resources/src/main/res/values-zh/strings.xml b/resources/src/main/res/values-zh/strings.xml
index 5517c80017..9c9e81cf43 100644
--- a/resources/src/main/res/values-zh/strings.xml
+++ b/resources/src/main/res/values-zh/strings.xml
@@ -160,7 +160,7 @@
   <string name="action_closeThis">关闭当前</string>
   <string name="all_saved">所有文件已保存！</string>
   <string name="save_failed">文件保存失败</string>
-  <string name="msg_newfile_dest">目标: %s/</string>
+  <string name="msg_newfile_dest">位于：%s/</string>
   <string name="restype_drawable">可绘制资源</string>
   <string name="restype_layout">布局</string>
   <string name="restype_menu">菜单</string>
@@ -192,8 +192,6 @@
   <string name="idepref_editor_drawhexcolors_summary">编辑器应该着色十六进制颜色字符串吗？</string>
   <string name="idepref_editor_word_wrap_title">自动换行</string>
   <string name="idepref_editor_word_wrap_summary">在编辑器中使用自动换行</string>
-  <string name="idepref_editor_hide_file_tree_button_title">隐藏文件树按钮</string>
-  <string name="idepref_editor_hide_file_tree_button_summary">将“文件树”按钮移至编辑器工具栏的溢出菜单中。</string>
   <string name="idepref_editor_use_magnifier_title">启用放大镜</string>
   <string name="idepref_editor_use_magnifier_summary">在编辑器中选择文本时放大光标处的文本</string>
   <string name="idepref_editor_title">编辑器</string>
@@ -255,7 +253,7 @@
   <string name="idepref_editor_autoSave_summary">在关闭文件之前自动保存文件。这是一个实验性功能，您应该自己保存这些文件。</string>
   <string name="idepref_java_matchLower_summary">若启用，输入大小写字母都将提示类名及其作用域成员</string>
   <string name="idepref_editor_ligatures_title">连体字</string>
-  <string name="idepref_editor_ligatures_summary">启用/禁用 连体字</string>
+  <string name="idepref_editor_ligatures_summary">启用或禁用连体字</string>
   <string name="yes">是</string>
   <string name="no">否</string>
   <string name="msg_apk_install_intent_failed">无法启动 APK 安装程序</string>
@@ -306,8 +304,8 @@
   <string name="msg_gradle_installation_path">Gradle 安装路径</string>
   <string name="msg_gradle_installation_input_help">留空将使用 Gradle 包装器</string>
   <string name="msg_require_install_jdk_and_android_sdk">您需要安装 JDK 和 Android SDK 才能使 IDE 工作。要安装，请单击“是”并按照<![CDATA[ <a href="https://github.com/itsaky/androidide-build-tools#installing-in-androidide">此处</a>]]>的说明进行操作</string>
-  <string name="build_status_idle">无进行中构建</string>
-  <string name="build_status_in_progress">正在构建&#8230;</string>
+  <string name="build_status_idle">没有正在进行的构建</string>
+  <string name="build_status_in_progress">构建正在进行中……</string>
   <string name="build_status_failed">构建失败，请参阅构建输出以获取详情</string>
   <string name="build_status_sucess">构建成功</string>
   <string name="msg_output_text_extraction_failed">无法从编辑器获取文本</string>
@@ -391,7 +389,7 @@
   <string name="msg_package_not_valid_char_2">Android 应用的软件包名称中不允许使用字符“%1$s”</string>
   <string name="msg_package_mus_have_dot">软件包名称中必须至少有一个“.”分隔</string>
   <string name="action_import_classes">导入类</string>
-  <string name="action_generate_setters_getters">生成 set/get 方法</string>
+  <string name="action_generate_setters_getters">生成 setter/getter</string>
   <string name="action_add_throws">添加“throws”</string>
   <string name="action_comment_line">注释此行</string>
   <string name="action_create_missing_method">创建缺失方法</string>
@@ -441,7 +439,7 @@
   <string name="git_clone">克隆</string>
   <string name="git_clone_repo">克隆 git 仓库</string>
   <string name="git_clone_repo_url">存储库 URL</string>
-  <string name="git_clone_in_progress">克隆库</string>
+  <string name="git_clone_in_progress">克隆存储库</string>
   <string name="git_clone_success">git 克隆成功</string>
   <string name="git_clone_failed">无法克隆 git 存储库</string>
   <string name="msg_select_attr">从下面的列表中选择一个属性</string>
@@ -456,7 +454,7 @@
   <string name="idepref_general_themeSelector_title">主题</string>
   <string name="idepref_general_themeSelector_summary">选择 AndroidIDE 主题（需要重启）。</string>
   <string name="idepref_general_projectConfig">项目配置</string>
-  <string name="msg_app_launch_failed">无法启动应用。有关详细信息，请参阅 IDE 日志。</string>
+  <string name="msg_app_launch_failed">启动失败，请先安装应用。</string>
   <string name="idepref_java_diagnosticEnabled_title">启用诊断</string>
   <string name="idepref_java_diagnosticsEnabled_summary">（实验性）是否应该分析 Java 源文件的错误。</string>
   <string name="title_reload_color_schemes">重载配色方案</string>
@@ -501,7 +499,7 @@
   <string name="btn_opt_in">选择加入</string>
   <string name="btn_no_thanks">不用了，谢谢</string>
   <string name="title_developer_options">开发者选项</string>
-  <string name="idepref_devOptions_summary">AndroidIDE 的实验/调试选项</string>
+  <string name="idepref_devOptions_summary">AndroidIDE 的实验和调试选项</string>
   <string name="idepref_group_debugging">调试</string>
   <string name="idepref_devOptions_dumpLogs_title">转储日志</string>
   <string name="idepref_devOptions_dumpLogs_summary">将 AndroidIDE 日志转储到 $HOME/.androidide/logs</string>
@@ -543,4 +541,5 @@
   <string name="msg_project_dir_inaccessible">无法访问项目目录</string>
   <string name="msg_file_is_not_dir">所选文件不是目录</string>
   <string name="msg_project_dir_doesnt_exist">项目目录不存在</string>
+  <string name="msg_files_being_saved">文件保存操作已在进行中！</string>
 </resources>