diff --git a/imap2/res/values-ms/strings.xml b/imap2/res/values-ms/strings.xml
new file mode 100644
index 000000000..d19ec89b6
--- /dev/null
+++ b/imap2/res/values-ms/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="8277676436260081413">"Imap2"</string>
+</resources>
diff --git a/imap2/res/values-pt/strings.xml b/imap2/res/values-pt/strings.xml
new file mode 100644
index 000000000..d19ec89b6
--- /dev/null
+++ b/imap2/res/values-pt/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="8277676436260081413">"Imap2"</string>
+</resources>
diff --git a/imap2/res/values-zh-rCN/strings.xml b/imap2/res/values-zh-rCN/strings.xml
new file mode 100644
index 000000000..3c2e559c3
--- /dev/null
+++ b/imap2/res/values-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="8277676436260081413">"IMAP2"</string>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 80c812478..5b35e482f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Ще прочета това по-късно и ще се свържа с Вас."</string>
     <string name="quick_4" msgid="3988974084396883051">"Нека да насрочим среща, за да обсъдим това."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизирането на заден план за този профил е деактивирано при роуминг."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Отговорът се изпраща…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Няма съобщения."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Подбирайте внимателно!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Избор на папка „Кошче“ за сървъра"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Избор на папка за изпратени до сървъра елементи"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Създаване на папка"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7516d1b66..76d9d487e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Přečtu si to později a ozvu se."</string>
     <string name="quick_4" msgid="3988974084396883051">"Můžeme si dohodnout schůzku, abychom to prodiskutovali."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizace na pozadí je v tomto účtu při roamingu zakázána."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Odesílání odpovědi..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žádné zprávy."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Kdo vybírá, přebere."</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Vyberte na serveru složku koše"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Vyberte na serveru složku odeslaných položek"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Vytvořit složku"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0d885efe3..ca3ba0aaa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Ich lese die Nachricht später und melde mich dann."</string>
     <string name="quick_4" msgid="3988974084396883051">"Wir können das am besten bei einem Meeting besprechen."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Die Hintergrundsynchronisierung ist für dieses Konto während des Roamings deaktiviert."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Antwort wird gesendet…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Keine Nachrichten"</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push-IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Ordner auswählen"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Papierkorb des Servers wählen"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Ordner \"Gesendete Elemente\" des Servers wählen"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Ordner erstellen"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ee6bfd245..d4f81b0b9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Lo leeré más adelante y me pondré en contacto contigo."</string>
     <string name="quick_4" msgid="3988974084396883051">"Vamos a convocar a una reunión para tratar esto."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Enviando respuesta…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hay mensajes."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Muy exigente"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Carpeta de papelera"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Carpeta elementos enviados"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Crear carpeta"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 54218b7fb..03da0a3fb 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Loen seda hiljem ja võtan siis ühendust."</string>
     <string name="quick_4" msgid="3988974084396883051">"Lepime kokku kohtumise, et seda arutada."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Taustsünkroonimine on sellel kontol rändluse ajal keelatud."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Vastuse saatmine ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Sõnumeid pole."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Tõuke-IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Valiv, valiv, valiv!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Valige serv. prügikasti kaust"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Valige serv. saad. üks. kaust"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Loo kaust"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 847d309b8..790d96c11 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"بعداً این را میخوانم و به شما اطلاع میدهم."</string>
     <string name="quick_4" msgid="3988974084396883051">"بیایید یک جلسه تشکیل بدهیم و درباره آن گفتگو کنیم."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"هنگام رومینگ، همگام‌سازی پس‌زمینه برای این حساب غیرفعال است."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"در حال ارسال پاسخ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"پیامی موجود نیست."</string>
     <string name="imap2_name" msgid="2742745881421883233">"ارسال IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"مشکل پسند، مشکل پسند، مشکل پسند!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"انتخاب پوشه حذف‌شده‌های سرور"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"انتخاب پوشه موارد ارسال شده سرور"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"ایجاد پوشه"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 482e5b7ec..d34e6a11c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Luen tämän myöhemmin ja palaan asiaan."</string>
     <string name="quick_4" msgid="3988974084396883051">"Järjestetään tapaaminen ja keskustellaan asiasta."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Tämän tilin taustasynkronointi on pois käytöstä roaming-tilassa."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Vastausta lähetetään..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ei viestejä."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push-IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Nirso!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Valitse palvelimen roskakori"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Valitse palvelimen lähetetyt kohteet -kansio"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Luo kansio"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 62e78ef44..fa976b993 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"मैं इसे बाद में पढ़ूंगा/पढ़ूगी और आपसे संपर्क करूंगा/करूंगी."</string>
     <string name="quick_4" msgid="3988974084396883051">"आइए इस पर चर्चा करने के लिए कोई मीटिंग सेट करें."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिंग के दौरान इस खाते के लिए पृष्ठभूमि समन्‍वयन अक्षम है."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"प्रतिक्रिया भेज रहा है..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"कोई संदेश नहीं."</string>
     <string name="imap2_name" msgid="2742745881421883233">"पुश IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"चुनें, चुनें, चुनें!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"सर्वर के ट्रैश फ़ोल्डर का चयन करें"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"सर्वर के भेजे गए आइटम फ़ोल्डर का चयन करें"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"फ़ोल्डर बनाएं"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 7946f51b0..57f820ac9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Pročitat ću to kasnije i javiti vam se."</string>
     <string name="quick_4" msgid="3988974084396883051">"Hajdemo dogovoriti sastanak na kojem ćemo raspraviti o tome."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Pozadinska sinkronizacija za ovaj račun onemogućena je u roamingu."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Slanje odgovora..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nema poruka."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Birajte, birajte, birajte!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Odaberite poslužiteljsku mapu za smeće"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Odaberite poslužiteljsku mapu za poslane stavke"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Izradi mapu"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 189fef53d..ce0d89628 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Később elolvasom és visszatérünk rá."</string>
     <string name="quick_4" msgid="3988974084396883051">"Szervezzünk egy találkozót a dolog megvitatására."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A fiók háttérben zajló szinkronizálása le van tiltva barangolás közben."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Válasz küldése..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nincsenek üzenetek."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Nyomja meg az IMAP-et"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Válogatós, válogatós, válogatós!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Válassza ki a szerver lomtárát"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Válassza ki a szerver küldött elemek mappáját"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Mappa létrehozása"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8ec439c79..20f832883 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Saya akan membaca ini nanti dan mengabari Anda."</string>
     <string name="quick_4" msgid="3988974084396883051">"Mari kita adakan pertemuan untuk membahas masalah ini."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinkronisasi latar belakang untuk akun ini dinonaktifkan saat roaming."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Mengirim tanggapan..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Tidak ada pesan."</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAP push"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Pilih, pilih, pilih!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pilih folder sampah server"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pilih folder item terkirim"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Buat folder"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8598ab7f7..96b42fc55 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"אקרא את זה מאוחר יותר ואחזור אליך."</string>
     <string name="quick_4" msgid="3988974084396883051">"בוא נקבע פגישה כדי לדון בנושא זה."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"סינכרון ברקע של חשבון זה מושבת בזמן נדידה."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"שולח תגובה…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"אין הודעות."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"בררן, בררן, בררן!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"בחר בתיקיית השרת \'אשפה\'"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"בחר בתיקיית השרת \'פריטים שנשלחו\'"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"צור תיקיה"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0f03195e6..0418fd70e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"確認して折り返し連絡します。"</string>
     <string name="quick_4" msgid="3988974084396883051">"この件についてミーティングを行いませんか。"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"このアカウントのバックグラウンドでの同期は、ローミング中は無効です。"</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"出欠状況を送信しています…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"メッセージはありません。"</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAPをプッシュ"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"フォルダを選択"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"サーバーのゴミ箱フォルダを選択"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"サーバーの送信済みフォルダを選択"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"フォルダを作成"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f89bdb78e..eb81db4ea 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"나중에 읽어보고 연락 드리겠습니다."</string>
     <string name="quick_4" msgid="3988974084396883051">"회의에서 얘기해 봅시다."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"계정 백그라운드 동기화가 로밍하는 동안 사용 중지됩니다."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"응답을 보내는 중..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"메시지가 없습니다."</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAP 푸시"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"서버의 휴지통 폴더 선택"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"서버의 전송한 항목 폴더 선택"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"폴더 만들기"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 14a78c8c8..798a6315d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -493,14 +493,11 @@
     <!-- no translation found for confirm_response (9151965975158906286) -->
     <skip />
     <string name="no_conversations" msgid="5559527390337162819">"Tiada mesej."</string>
-    <!-- no translation found for imap2_name (2742745881421883233) -->
-    <skip />
-    <!-- no translation found for folder_picker_title (5213735893918108637) -->
-    <skip />
+    <string name="imap2_name" msgid="2742745881421883233">"IMAP Tolak"</string>
+    <string name="folder_picker_title" msgid="5213735893918108637">"Cerewet betul!"</string>
     <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
     <skip />
     <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
     <skip />
-    <!-- no translation found for create_new_folder (2726544180243210741) -->
-    <skip />
+    <string name="create_new_folder" msgid="2726544180243210741">"Buat folder"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d29cc7529..48211b3c2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Jeg skal lese dette senere og ta kontakt."</string>
     <string name="quick_4" msgid="3988974084396883051">"Jeg foreslår at vi avtaler et møte for å diskutere dette."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrunnssynkronisering for denne kontoen er deaktivert under streifing."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Sender svaret ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ingen e-poster."</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAP for Push"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Kresen, kresen, kresen!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Velg tjenerens papirkurvmappe"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Velg tjenerens mappe for sendte elementer"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Opprett en mappe"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 99057b561..6e28e37bd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Przeczytam to później i skontaktuję się."</string>
     <string name="quick_4" msgid="3988974084396883051">"Spotkajmy się, aby to omówić."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Wysyłam odpowiedź…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Brak wiadomości."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Wybredny, wybredny, wybredny!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Wybierz folder kosza na serwerze"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Wybierz folder elementów wysłanych na serwerze"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Utwórz folder"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7499822c3..b79dfda26 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -490,17 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Lerei isso mais tarde e darei uma resposta a você."</string>
     <string name="quick_4" msgid="3988974084396883051">"Podemos marcar uma reunião para discutir isso."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano para essa conta é desativada durante o roaming."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Enviando resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nenhuma mensagem."</string>
-    <!-- no translation found for imap2_name (2742745881421883233) -->
-    <skip />
-    <!-- no translation found for folder_picker_title (5213735893918108637) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
-    <!-- no translation found for create_new_folder (2726544180243210741) -->
-    <skip />
+    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <string name="folder_picker_title" msgid="5213735893918108637">"Exigente, exigente, exigente!"</string>
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Selec. pasta de lixo do serv."</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sel. pasta enviados do serv."</string>
+    <string name="create_new_folder" msgid="2726544180243210741">"Criar pasta"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5b9295cb6..2cf9cd391 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Voi citi mai târziu acest mesaj şi vă voi contacta."</string>
     <string name="quick_4" msgid="3988974084396883051">"Să stabilim o întâlnire pentru a discuta această acţiune."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Se trimite răspunsul…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAP de tip push"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Dosar coş de gunoi pt. server"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Dosar elem. trimise pt. server"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Creaţi un dosar"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 994cbedcf..4b21e5997 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Я отвечу позже."</string>
     <string name="quick_4" msgid="3988974084396883051">"Это нужно обсудить при встрече."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Для этого аккаунта отключена фоновая синхронизация в роуминге."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Отправка ответа…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Писем нет."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Выбрать папку"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Укажите папку для удаленных"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Укажите папку для отправленных"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Новая папка"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b8cdd84ec..c8a463166 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Prečítam si to neskôr a dám vám vedieť."</string>
     <string name="quick_4" msgid="3988974084396883051">"Dohodnime si schôdzku a prediskutujme to."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Odosiela sa odpoveď..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Kto dlho vyberá, nakoniec nič nevyberie."</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Vyberte prieč. servera pre kôš"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Vyberte prieč. serv. pre odosl. položky"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Vytvoriť priečinok"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index da712f541..795967605 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Trenutno nimam časa. Odgovorim pozneje."</string>
     <string name="quick_4" msgid="3988974084396883051">"Skličimo sestanek in se pogovorimo."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinhronizacija v ozadju je za ta račun med gostovanjem onemogočena."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Pošiljanje odgovora ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ni sporočil."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Potisni IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Izbirčna Metka!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Izbira mape za koš v strežniku"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Izbira mape s poslanimi sporočili v strežniku"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Ustvarjanje mape"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 6f7730080..f7f2434dd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Прочитаћу ово касније и јавити вам."</string>
     <string name="quick_4" msgid="3988974084396883051">"Хајде да организујемо састанак како бисмо о овоме разговарали."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизација у позадини за овај налог је онемогућена у ромингу."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Слање одговора..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Нема порука."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Бирање, бирање, бирање!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Изаберите дир. за отпад на серверу"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Изаберите дир. за послате ставке на серверу"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Направи директоријум"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0ed9e4e34..7ded3539a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"ฉันจะอ่านและตอบกลับทีหลัง"</string>
     <string name="quick_4" msgid="3988974084396883051">"จัดการประชุมเพื่อคุยเรื่องนี้กัน"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"การซิงค์พื้นหลังสำหรับบัญชีนี้ถูกปิดใช้งานขณะโรมมิ่ง"</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"กำลังส่งการตอบกลับ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"ไม่มีข้อความ"</string>
     <string name="imap2_name" msgid="2742745881421883233">"ส่งการเข้าถึงแบบ IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"ช่างเลือกจริงๆ เลย!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"เลือกโฟลเดอร์ถังขยะของเซิร์ฟเวอร์"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"เลือกโฟลเดอร์รายการที่ส่งของเซิร์ฟเวอร์"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"สร้างโฟลเดอร์"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5c94dc82d..024e437ae 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Babasahin ko ito sa ibang pagkakataon at babalik sa iyo."</string>
     <string name="quick_4" msgid="3988974084396883051">"Magtakda tayo ng pulong upang talakayin ito."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Hindi pinapagana ang background na pag-sync para sa account na ito habang nagro-roam."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Ipinapadala ang tugon…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Walang mga mensahe."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Mapili ka!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pili folder basurahan server"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pili folder padala item server"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Lumikha ng folder"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 97fd1dc4c..a0a85fff9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Bunu daha sonra okuyup size geri döneceğim."</string>
     <string name="quick_4" msgid="3988974084396883051">"Bu konuyu tartışmak üzere bir toplantı ayarlayalım."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Dolaşımdayken bu hesabın arka plan senkronizasyonu devre dışı bırakılır."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Yanıt gönderiliyor…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"İleti yok."</string>
     <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"titiz, titiz, titiz!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Sunucunun çöp kutusu klasörünü seçin"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sunucunun gönderilen öğeler klasörünü seçin"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Klasör oluştur"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 924fb997f..5c541f0b4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"Tôi sẽ đọc thư này sau và sẽ liên hệ lại với bạn."</string>
     <string name="quick_4" msgid="3988974084396883051">"Chúng ta hãy cùng tổ chức một cuộc họp để thảo luận về vấn đề này."</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Đồng bộ hóa nền cho tài khoản này bị tắt trong khi chuyển vùng."</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"Đang gửi trả lời..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Không có thư nào."</string>
     <string name="imap2_name" msgid="2742745881421883233">"IMAP đẩy thư"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"Vui lòng chọn!"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"Chọn thư mục thùng rác trên máy chủ"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"Chọn thư mục thư đã gửi trên máy chủ"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Tạo thư mục"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 63a32e806..8517a79ec 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -493,14 +493,11 @@
     <!-- no translation found for confirm_response (9151965975158906286) -->
     <skip />
     <string name="no_conversations" msgid="5559527390337162819">"无邮件。"</string>
-    <!-- no translation found for imap2_name (2742745881421883233) -->
-    <skip />
-    <!-- no translation found for folder_picker_title (5213735893918108637) -->
-    <skip />
+    <string name="imap2_name" msgid="2742745881421883233">"推送 IMAP"</string>
+    <string name="folder_picker_title" msgid="5213735893918108637">"千挑万选！"</string>
     <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
     <skip />
     <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
     <skip />
-    <!-- no translation found for create_new_folder (2726544180243210741) -->
-    <skip />
+    <string name="create_new_folder" msgid="2726544180243210741">"新建文件夹"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f5868171d..3655e6492 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -490,14 +490,11 @@
     <string name="quick_3" msgid="8061819976353395585">"我稍晚看過後回覆您。"</string>
     <string name="quick_4" msgid="3988974084396883051">"開會討論吧。"</string>
     <string name="require_manual_sync_message" msgid="7777357288642785955">"系統會在漫遊時停用這個帳戶的背景同步處理。"</string>
-    <!-- no translation found for confirm_response (9151965975158906286) -->
-    <skip />
+    <string name="confirm_response" msgid="9151965975158906286">"正在傳送回應..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"沒有任何郵件。"</string>
     <string name="imap2_name" msgid="2742745881421883233">"推送 IMAP"</string>
     <string name="folder_picker_title" msgid="5213735893918108637">"仔細挑選！"</string>
-    <!-- no translation found for trash_folder_selection_title (8287461989726013461) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (3868598259968276968) -->
-    <skip />
+    <string name="trash_folder_selection_title" msgid="8287461989726013461">"選取伺服器垃圾郵件資料夾"</string>
+    <string name="sent_folder_selection_title" msgid="3868598259968276968">"選取伺服器寄件備份資料夾"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"建立資料夾"</string>
 </resources>