Progressive search improvements, crowdin sync

README.md

@@ -33,7 +33,7 @@ Pro features
 
 * Preview sender/subject in new messages status bar notification
 * Encrypt/decrypt messages using [OpenPGP](https://www.openpgp.org/)
-* Search on server
+* Progressive search (first local, then server)
 * Standard answers
 
 Simple

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -43,12 +43,9 @@ import com.sun.mail.imap.IMAPFolder;
 import com.sun.mail.imap.IMAPMessage;
 import com.sun.mail.imap.IMAPStore;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import javax.mail.Folder;
 import javax.mail.Message;
@@ -379,14 +376,10 @@ public class FragmentMessages extends FragmentEx {
                                 private IMAPStore istore = null;
                                 private IMAPFolder ifolder = null;
                                 private Message[] imessages = null;
-                                private int offset = 0;
                                 private boolean observing = false;
-                                private ExecutorService executor = Executors.newSingleThreadExecutor();
 
                                 @Override
                                 public void onItemAtEndLoaded(final TupleMessageEx itemAtEnd) {
-                                    final Context context = getContext();
-
                                     if (!observing) {
                                         observing = true;
                                         getLifecycle().addObserver(new GenericLifecycleObserver() {
@@ -409,7 +402,12 @@ public class FragmentMessages extends FragmentEx {
                                         });
                                     }
 
-                                    executor.submit(new Runnable() {
+                                    Log.i(Helper.TAG, "SDS more");
+
+                                    // Hold on to context
+                                    final Context context = getContext();
+
+                                    new Thread(new Runnable() {
                                         @Override
                                         public void run() {
                                             try {
@@ -450,29 +448,22 @@ public class FragmentMessages extends FragmentEx {
                                                     Log.i(Helper.TAG, "SDS found messages=" + imessages.length);
                                                 }
 
-                                                Log.i(Helper.TAG, "SDS offset=" + offset);
-                                                List<Message> selected = new ArrayList<>();
-                                                int index = imessages.length - 1 - offset;
-                                                while (selected.size() < SEARCH_PAGE_SIZE && index >= 0) {
-                                                    if (imessages[index].getReceivedDate().getTime() < itemAtEnd.received)
-                                                        selected.add(imessages[index]);
+                                                int index = imessages.length - 1;
+                                                while (index >= 0) {
+                                                    if (imessages[index].getReceivedDate().getTime() < itemAtEnd.received) {
+                                                        Log.i(Helper.TAG, "Search sync uid=" + ifolder.getUID(imessages[index]));
+                                                        ServiceSynchronize.synchronizeMessage(context, _folder, ifolder, (IMAPMessage) imessages[index], true);
+                                                        break;
+                                                    }
                                                     index--;
                                                 }
-                                                Log.i(Helper.TAG, "SDS selected messages=" + selected.size());
-
-                                                for (Message imessage : selected) {
-                                                    Log.i(Helper.TAG, "Search sync uid=" + ifolder.getUID(imessage));
-                                                    ServiceSynchronize.synchronizeMessage(context, _folder, ifolder, (IMAPMessage) imessage, true);
-                                                }
-
-                                                offset += selected.size();
 
                                                 Log.i(Helper.TAG, "SDS done");
                                             } catch (Throwable ex) {
                                                 Log.i(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
                                             }
                                         }
-                                    });
+                                    }).start();
                                 }
                             })
                             .build();

app/src/main/res/values-af/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ar-rBH/strings.xml

@@ -167,7 +167,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ar-rEG/strings.xml

@@ -167,7 +167,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ar-rSA/strings.xml

@@ -167,7 +167,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ar-rYE/strings.xml

@@ -167,7 +167,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ar/strings.xml

@@ -167,7 +167,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ca/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-cs/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-da/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Kladde gemt</string>
   <string name="title_queued">Sender besked</string>
   <string name="title_search">Søg</string>
-  <string name="title_search_hint">Søg på server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Søger \'%1$s \'</string>
   <string name="title_answer_reply">Standard svar</string>
   <string name="title_answer_name">Svarnavn</string>

app/src/main/res/values-de/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Entwurf gespeichert</string>
   <string name="title_queued">Nachricht senden\u2026</string>
   <string name="title_search">Suche</string>
-  <string name="title_search_hint">Auf Server suchen</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Suche „%1$s“</string>
   <string name="title_answer_reply">Standardantworten</string>
   <string name="title_answer_name">Antwort Name</string>
@@ -165,7 +165,7 @@
   <string name="title_legend_connected">Verbunden</string>
   <string name="title_legend_synchronizing">Synchronisiere</string>
   <string name="title_legend_closing">Schließen</string>
-  <string name="title_hint_actions">Swipe left to trash; swipe right to archive (if available); long press to mark read/unread</string>
+  <string name="title_hint_actions">Nach links wischen um in den Papierkorb zu werfen; Nach rechts wischen zum archivieren (sofern verfügbar); langes Drücken um als gelesen/ungelesen zu markieren</string>
   <string name="title_understood">Verstanden</string>
   <string name="title_pro_feature">Dies ist eine Premium Funktion</string>
   <string name="title_pro_list">Liste der Premium Funktionen</string>

app/src/main/res/values-el/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-en/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-es-rES/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-fi/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-fr/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Brouillon enregistré</string>
   <string name="title_queued">Envoi du message</string>
   <string name="title_search">Rechercher</string>
-  <string name="title_search_hint">Rechercher sur le serveur</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Recherche de \'%1$s\'</string>
   <string name="title_answer_reply">Réponse standard</string>
   <string name="title_answer_name">Nom de la réponse</string>

app/src/main/res/values-he/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-hu/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-it/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Bozza salvata</string>
   <string name="title_queued">Invio messaggio</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-iw/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ja/strings.xml

@@ -147,7 +147,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ko/strings.xml

@@ -147,7 +147,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-nb/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-nl/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-no/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-pl/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Szkic zapisany</string>
   <string name="title_queued">Wysyłanie wiadomości</string>
   <string name="title_search">Szukaj</string>
-  <string name="title_search_hint">Szukaj na serwerze</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Szukam \'%1$s\'</string>
   <string name="title_answer_reply">Standardowa odpowiedź</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Rascunho salvo</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-ro/strings.xml

@@ -155,7 +155,7 @@
   <string name="title_draft_saved">Ciornă salvată</string>
   <string name="title_queued">Expediere mesaj</string>
   <string name="title_search">Caută</string>
-  <string name="title_search_hint">Căutare pe server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Se caută \'%1$s\'</string>
   <string name="title_answer_reply">Răspuns standard</string>
   <string name="title_answer_name">Titlu răspuns</string>

app/src/main/res/values-ru/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-sr/strings.xml

@@ -155,7 +155,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-sv-rSE/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-tr/strings.xml

@@ -151,7 +151,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-uk/strings.xml

@@ -159,7 +159,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-vi/strings.xml

@@ -147,7 +147,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,175 +1,175 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
-  <string name="channel_service">Service</string>
-  <string name="channel_notification">Notifications</string>
-  <string name="channel_error">Errors</string>
+  <string name="app_copyright">版权所有 &#x24B8; 2018，M. Bokhorst</string>
+  <string name="channel_service">服务</string>
+  <string name="channel_notification">通知</string>
+  <string name="channel_error">错误</string>
   <plurals name="title_notification_synchronizing">
-    <item quantity="other">Synchronizing %1$d accounts</item>
+    <item quantity="other">正在同步%1$d个账户</item>
   </plurals>
   <plurals name="title_notification_operations">
-    <item quantity="other">%1$d operations pending</item>
+    <item quantity="other">有%1$d个操作待执行</item>
   </plurals>
   <plurals name="title_notification_unseen">
-    <item quantity="other">%1$d new messages</item>
+    <item quantity="other">%1$d条新消息</item>
   </plurals>
   <plurals name="title_notification_unsent">
-    <item quantity="other">%1$d unsent messages</item>
+    <item quantity="other">%1$d条消息未发送</item>
   </plurals>
-  <string name="title_notification_failed">\'%1$s\' failed</string>
-  <string name="menu_setup">Setup</string>
-  <string name="menu_answers">Standard replies</string>
-  <string name="menu_operations">Operations</string>
-  <string name="menu_legend">Legend</string>
-  <string name="menu_faq">FAQ</string>
-  <string name="menu_pro">Pro features</string>
-  <string name="menu_privacy">Privacy</string>
-  <string name="menu_about">About</string>
-  <string name="menu_other">Other apps</string>
-  <string name="title_eula">End-user license agreement</string>
-  <string name="title_agree">I agree</string>
-  <string name="title_disagree">I disagree</string>
-  <string name="title_version">Version %1$s</string>
-  <string name="title_list_accounts">Accounts</string>
-  <string name="title_list_identities">Identities</string>
-  <string name="title_edit_account">Edit account</string>
-  <string name="title_edit_identity">Edit identity</string>
-  <string name="title_edit_folder">Edit folder</string>
-  <string name="title_setup">Setup</string>
-  <string name="title_setup_account">Manage accounts</string>
-  <string name="title_setup_account_remark">To receive email</string>
-  <string name="title_setup_identity">Manage identities</string>
-  <string name="title_setup_identity_remark">To send email</string>
-  <string name="title_setup_permissions">Grant permissions</string>
-  <string name="title_setup_permissions_remark">To autocomplete addresses (optional)</string>
-  <string name="title_setup_to_do">To do</string>
-  <string name="title_setup_done">Done</string>
-  <string name="title_setup_dark_theme">Dark theme</string>
-  <string name="title_advanced">Advanced options</string>
-  <string name="title_advanced_webview">Use WebView to show external links</string>
-  <string name="title_advanced_customtabs">Instead of <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
-  <string name="title_advanced_sanitize">Remove HTML formatting from messages</string>
-  <string name="title_advanced_compress_imap">Compress IMAP data</string>
-  <string name="title_advanced_debug">Debug</string>
-  <string name="title_select">Select &#8230;</string>
-  <string name="title_identity_name">Your name</string>
-  <string name="title_identity_email">Your email address</string>
-  <string name="title_identity_reply_to">Reply to address</string>
-  <string name="title_optional">Optional</string>
-  <string name="title_account_linked">Linked account</string>
-  <string name="title_account_name">Account name</string>
-  <string name="title_account_name_hint">Used to differentiate folders</string>
+  <string name="title_notification_failed">“%1$s”失败</string>
+  <string name="menu_setup">设置</string>
+  <string name="menu_answers">标准回复</string>
+  <string name="menu_operations">操作</string>
+  <string name="menu_legend">图例</string>
+  <string name="menu_faq">常见问题</string>
+  <string name="menu_pro">专业版</string>
+  <string name="menu_privacy">隐私政策</string>
+  <string name="menu_about">关于</string>
+  <string name="menu_other">其他应用</string>
+  <string name="title_eula">最终用户许可协议</string>
+  <string name="title_agree">我同意</string>
+  <string name="title_disagree">我拒绝</string>
+  <string name="title_version">版本 %1$s</string>
+  <string name="title_list_accounts">账户</string>
+  <string name="title_list_identities">身份</string>
+  <string name="title_edit_account">编辑账户</string>
+  <string name="title_edit_identity">编辑身份</string>
+  <string name="title_edit_folder">编辑文件夹</string>
+  <string name="title_setup">设置</string>
+  <string name="title_setup_account">管理账户</string>
+  <string name="title_setup_account_remark">用于接收电子邮件</string>
+  <string name="title_setup_identity">管理身份</string>
+  <string name="title_setup_identity_remark">用于发送电子邮件</string>
+  <string name="title_setup_permissions">授予权限</string>
+  <string name="title_setup_permissions_remark">用于联系人自动补全（可选）</string>
+  <string name="title_setup_to_do">未设置</string>
+  <string name="title_setup_done">已设置</string>
+  <string name="title_setup_dark_theme">暗色主题</string>
+  <string name="title_advanced">高级选项</string>
+  <string name="title_advanced_webview">使用应用内浏览器查看外部链接</string>
+  <string name="title_advanced_customtabs">而非使用 <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a></string>
+  <string name="title_advanced_sanitize">去除邮件中的 HTML 格式</string>
+  <string name="title_advanced_compress_imap">压缩 IMAP 数据</string>
+  <string name="title_advanced_debug">调试模式</string>
+  <string name="title_select">选择 &#8230;</string>
+  <string name="title_identity_name">姓名</string>
+  <string name="title_identity_email">电子邮件地址</string>
+  <string name="title_identity_reply_to">回复地址</string>
+  <string name="title_optional">可选的</string>
+  <string name="title_account_linked">已绑定的账户</string>
+  <string name="title_account_name">账户名称</string>
+  <string name="title_account_name_hint">用于区分文件夹</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
-  <string name="title_provider">Provider</string>
-  <string name="title_custom">Custom</string>
-  <string name="title_host">Host name</string>
+  <string name="title_provider">服务提供商</string>
+  <string name="title_custom">自定义</string>
+  <string name="title_host">主机名称</string>
   <string name="title_starttls">STARTTLS</string>
-  <string name="title_port">Port number</string>
-  <string name="title_user">User name</string>
-  <string name="title_password">Password</string>
-  <string name="title_authorize">Select account</string>
-  <string name="title_instructions">Instructions</string>
-  <string name="title_store_sent">Store sent messages (enable if needed only)</string>
-  <string name="title_interval">Keep-alive interval (minutes)</string>
-  <string name="title_synchronize_account">Synchronize (receive messages)</string>
-  <string name="title_synchronize_identity">Synchronize (send messages)</string>
-  <string name="title_primary_account">Primary (default account)</string>
-  <string name="title_primary_identity">Primary (default identity)</string>
-  <string name="title_check">Check</string>
-  <string name="title_no_name">Name missing</string>
-  <string name="title_no_email">Email address missing</string>
-  <string name="title_no_account">Account missing</string>
-  <string name="title_no_host">Host name missing</string>
-  <string name="title_no_port">Port number missing</string>
-  <string name="title_no_user">User name missing</string>
-  <string name="title_no_password">Password missing</string>
-  <string name="title_no_drafts">Drafts folder missing</string>
-  <string name="title_no_idle">IDLE not supported</string>
-  <string name="title_no_uidplus">UIDPLUS not supported</string>
-  <string name="title_account_delete">Delete this account permanently?</string>
-  <string name="title_identity_delete">Delete this identity permanently?</string>
-  <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-  <string name="title_after">Synchronize (days)</string>
-  <string name="title_folder_unified">Unified inbox</string>
-  <string name="title_folder_inbox">Inbox</string>
-  <string name="title_folder_outbox">Outbox</string>
-  <string name="title_folder_all">Archive</string>
-  <string name="title_folder_drafts">Drafts</string>
-  <string name="title_folder_trash">Trash</string>
-  <string name="title_folder_junk">Spam</string>
-  <string name="title_folder_sent">Sent</string>
-  <string name="title_folder_user">User</string>
-  <string name="title_folder_primary">Folders primary account</string>
-  <string name="title_folder_thread">Message thread</string>
-  <string name="title_no_messages">No messages</string>
-  <string name="title_link">link</string>
-  <string name="title_image">image</string>
-  <string name="title_show_images">Show images</string>
-  <string name="title_subject_reply">Re: %1$s</string>
-  <string name="title_subject_forward">Fwd: %1$s</string>
-  <string name="title_thread">Show thread</string>
-  <string name="title_seen">Mark read</string>
-  <string name="title_unseen">Mark unread</string>
-  <string name="title_forward">Forward</string>
-  <string name="title_reply_all">Reply to all</string>
-  <string name="title_trash">Trash</string>
-  <string name="title_spam">Spam</string>
-  <string name="title_move">Move</string>
-  <string name="title_archive">Archive</string>
-  <string name="title_reply">Reply</string>
-  <string name="title_moving">Moving message to %1$s</string>
-  <string name="title_no_viewer">No viewer app available for %1$s</string>
-  <string name="title_attachment_saved">Attachment saved</string>
-  <string name="title_ask_delete">Delete message permanently?</string>
-  <string name="title_ask_spam">Report message as spam?</string>
-  <string name="title_compose">Compose</string>
-  <string name="title_from">From:</string>
-  <string name="title_to">To:</string>
-  <string name="title_reply_to">Reply to:</string>
-  <string name="title_cc">CC:</string>
-  <string name="title_bcc">BCC:</string>
-  <string name="title_subject">Subject:</string>
-  <string name="title_body_hint">Your message</string>
-  <string name="title_save">Save</string>
-  <string name="title_send">Send</string>
-  <string name="title_show_addresses">Show CC/BCC</string>
-  <string name="title_add_attachment">Add attachment</string>
-  <string name="title_no_openpgp">OpenPGP not available</string>
-  <string name="title_not_encrypted">Encrypted message not found</string>
-  <string name="title_encrypt">Encrypt</string>
-  <string name="title_decrypt">Decrypt</string>
-  <string name="title_from_missing">Sender missing</string>
-  <string name="title_to_missing">Recipient missing</string>
-  <string name="title_attachments_missing">Attachments still loading</string>
-  <string name="title_draft_trashed">Draft trashed</string>
-  <string name="title_draft_saved">Draft saved</string>
-  <string name="title_queued">Sending message</string>
-  <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
-  <string name="title_searching">Searching \'%1$s\'</string>
-  <string name="title_answer_reply">Standard reply</string>
-  <string name="title_answer_name">Answer name</string>
-  <string name="title_answer_text">Answer text</string>
-  <string name="title_legend_cc">CC/BCC</string>
-  <string name="title_legend_attachment">Attachment</string>
-  <string name="title_legend_synchronize">Synchronize</string>
-  <string name="title_legend_primary">Primary</string>
-  <string name="title_legend_disconnected">Disconnected</string>
-  <string name="title_legend_connecting">Connecting</string>
-  <string name="title_legend_connected">Connected</string>
-  <string name="title_legend_synchronizing">Synchronizing</string>
-  <string name="title_legend_closing">Closing</string>
-  <string name="title_hint_actions">Swipe left to trash; swipe right to archive (if available); long press to mark read/unread</string>
-  <string name="title_understood">Understood</string>
-  <string name="title_pro_feature">This is a pro feature</string>
-  <string name="title_pro_list">List of pro features</string>
-  <string name="title_pro_purchase">Buy</string>
-  <string name="title_pro_hint">Buying pro features will allow you to use all current and future pro features and will keep this app maintained and supported</string>
-  <string name="title_pro_activated">All pro features are activated</string>
-  <string name="title_pro_valid">All pro features activated</string>
-  <string name="title_pro_invalid">Invalid response</string>
-  <string name="title_debug_info">Debug info</string>
-  <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>
+  <string name="title_port">端口</string>
+  <string name="title_user">用户名</string>
+  <string name="title_password">密码</string>
+  <string name="title_authorize">选择账户</string>
+  <string name="title_instructions">说明</string>
+  <string name="title_store_sent">存储已发送的邮件（请只在需要时启用）</string>
+  <string name="title_interval">间隔（分钟）</string>
+  <string name="title_synchronize_account">同步（接收）</string>
+  <string name="title_synchronize_identity">同步（发送）</string>
+  <string name="title_primary_account">默认账户</string>
+  <string name="title_primary_identity">默认身份</string>
+  <string name="title_check">检查</string>
+  <string name="title_no_name">缺少名称</string>
+  <string name="title_no_email">缺少邮箱地址</string>
+  <string name="title_no_account">缺少账户</string>
+  <string name="title_no_host">缺少主机名称</string>
+  <string name="title_no_port">缺少端口</string>
+  <string name="title_no_user">缺少用户名</string>
+  <string name="title_no_password">缺少密码</string>
+  <string name="title_no_drafts">缺少草稿箱</string>
+  <string name="title_no_idle">IDLE 不受支持</string>
+  <string name="title_no_uidplus">UIDPLUS 不受支持</string>
+  <string name="title_account_delete">确定永久删除这个账户吗？</string>
+  <string name="title_identity_delete">确定永久删除这个身份吗？</string>
+  <string name="title_synchronize_folder">同步文件夹（接收）</string>
+  <string name="title_after">同步天数</string>
+  <string name="title_folder_unified">聚合收件箱</string>
+  <string name="title_folder_inbox">收件箱</string>
+  <string name="title_folder_outbox">发件箱</string>
+  <string name="title_folder_all">存档</string>
+  <string name="title_folder_drafts">草稿箱</string>
+  <string name="title_folder_trash">回收站</string>
+  <string name="title_folder_junk">垃圾邮件</string>
+  <string name="title_folder_sent">已发送邮件</string>
+  <string name="title_folder_user">用户</string>
+  <string name="title_folder_primary">文件夹主账户</string>
+  <string name="title_folder_thread">邮件会话</string>
+  <string name="title_no_messages">没有邮件</string>
+  <string name="title_link">链接</string>
+  <string name="title_image">图片</string>
+  <string name="title_show_images">显示图片</string>
+  <string name="title_subject_reply">回复：%1$s</string>
+  <string name="title_subject_forward">转发：%1$s</string>
+  <string name="title_thread">显示会话</string>
+  <string name="title_seen">标记为已读</string>
+  <string name="title_unseen">标记为未读</string>
+  <string name="title_forward">转发</string>
+  <string name="title_reply_all">回复全部</string>
+  <string name="title_trash">回收站</string>
+  <string name="title_spam">垃圾邮件</string>
+  <string name="title_move">移动</string>
+  <string name="title_archive">存档</string>
+  <string name="title_reply">回复</string>
+  <string name="title_moving">移动邮件至%1$s</string>
+  <string name="title_no_viewer">未找到能打开%1$s的应用程序</string>
+  <string name="title_attachment_saved">附件已保存</string>
+  <string name="title_ask_delete">确定要永久删除邮件吗？</string>
+  <string name="title_ask_spam">确定将邮件标为垃圾邮件吗？</string>
+  <string name="title_compose">新邮件</string>
+  <string name="title_from">发件人：</string>
+  <string name="title_to">收件人：</string>
+  <string name="title_reply_to">回复：</string>
+  <string name="title_cc">抄送：</string>
+  <string name="title_bcc">密送：</string>
+  <string name="title_subject">主题：</string>
+  <string name="title_body_hint">您的邮件内容……</string>
+  <string name="title_save">保存</string>
+  <string name="title_send">发送</string>
+  <string name="title_show_addresses">显示抄送和密送</string>
+  <string name="title_add_attachment">添加附件</string>
+  <string name="title_no_openpgp">OpenPGP 不可用</string>
+  <string name="title_not_encrypted">未找到加密邮件</string>
+  <string name="title_encrypt">加密</string>
+  <string name="title_decrypt">解密</string>
+  <string name="title_from_missing">缺少发件人</string>
+  <string name="title_to_missing">缺少收件人</string>
+  <string name="title_attachments_missing">附件加载中</string>
+  <string name="title_draft_trashed">草稿已删除</string>
+  <string name="title_draft_saved">草稿已保存</string>
+  <string name="title_queued">正在发送邮件</string>
+  <string name="title_search">搜索</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
+  <string name="title_searching">搜索 “%1$s”</string>
+  <string name="title_answer_reply">标准回复</string>
+  <string name="title_answer_name">回复名称</string>
+  <string name="title_answer_text">回复文本</string>
+  <string name="title_legend_cc">抄送或密送</string>
+  <string name="title_legend_attachment">附件</string>
+  <string name="title_legend_synchronize">同步</string>
+  <string name="title_legend_primary">首选</string>
+  <string name="title_legend_disconnected">未连接</string>
+  <string name="title_legend_connecting">正在连接</string>
+  <string name="title_legend_connected">已连接</string>
+  <string name="title_legend_synchronizing">正在同步</string>
+  <string name="title_legend_closing">正在结束</string>
+  <string name="title_hint_actions">向左滑掷入垃圾桶，向右滑存档（如果可用），长按切换已读状态</string>
+  <string name="title_understood">理解了</string>
+  <string name="title_pro_feature">这是专业版功能</string>
+  <string name="title_pro_list">专业版功能列表</string>
+  <string name="title_pro_purchase">购买</string>
+  <string name="title_pro_hint">购买专业版将获得现在以及未来更新中全部专业版功能，并将支持开发者维护这个应用</string>
+  <string name="title_pro_activated">专业版功能已激活</string>
+  <string name="title_pro_valid">专业版功能已激活</string>
+  <string name="title_pro_invalid">无效的响应</string>
+  <string name="title_debug_info">调试信息</string>
+  <string name="title_debug_info_remark">请描述问题及问题发生的时间：</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -147,7 +147,7 @@
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Search sender/subject/text</string>
   <string name="title_searching">Searching \'%1$s\'</string>
   <string name="title_answer_reply">Standard reply</string>
   <string name="title_answer_name">Answer name</string>

app/src/main/res/values/strings.xml

@@ -179,7 +179,7 @@
     <string name="title_queued">Sending message</string>
 
     <string name="title_search">Search</string>
-    <string name="title_search_hint">Search on server</string>
+    <string name="title_search_hint">Search sender/subject/text</string>
     <string name="title_searching">Searching \'%1$s\'</string>
 
     <string name="title_answer_reply">Standard reply</string>