From 12b801711fbb0169d933de6112011b82368b863c Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 1 Sep 2018 20:01:40 +0000 Subject: [PATCH] Progressive search improvements, crowdin sync --- README.md | 2 +- .../eu/faircode/email/FragmentMessages.java | 37 +- app/src/main/res/values-af/strings.xml | 2 +- app/src/main/res/values-ar-rBH/strings.xml | 2 +- app/src/main/res/values-ar-rEG/strings.xml | 2 +- app/src/main/res/values-ar-rSA/strings.xml | 2 +- app/src/main/res/values-ar-rYE/strings.xml | 2 +- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 4 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-es-rES/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv-rSE/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 320 +++++++++--------- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 39 files changed, 212 insertions(+), 221 deletions(-) diff --git a/README.md b/README.md index 9e416da7..7a8fab6b 100644 --- a/README.md +++ b/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 diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 5f09de42..92128309 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/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 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(); diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 713285dd..a6fe36ce 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -167,7 +167,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 713285dd..a6fe36ce 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -167,7 +167,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 713285dd..a6fe36ce 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -167,7 +167,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 713285dd..a6fe36ce 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -167,7 +167,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 713285dd..a6fe36ce 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -167,7 +167,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0d0b1d25..524035ec 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -159,7 +159,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 27a9f8f3..51842c3d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -151,7 +151,7 @@ Kladde gemt Sender besked Søg - Søg på server + Search sender/subject/text Søger \'%1$s \' Standard svar Svarnavn diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bbc3736b..a9b1d263 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -151,7 +151,7 @@ Entwurf gespeichert Nachricht senden\u2026 Suche - Auf Server suchen + Search sender/subject/text Suche „%1$s“ Standardantworten Antwort Name @@ -165,7 +165,7 @@ Verbunden Synchronisiere Schließen - Swipe left to trash; swipe right to archive (if available); long press to mark read/unread + 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 Verstanden Dies ist eine Premium Funktion Liste der Premium Funktionen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5deb2ab0..f1f04bfa 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -151,7 +151,7 @@ Brouillon enregistré Envoi du message Rechercher - Rechercher sur le serveur + Search sender/subject/text Recherche de \'%1$s\' Réponse standard Nom de la réponse diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 635e8f19..9a53cb57 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -159,7 +159,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a55f7387..239fc3d1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -151,7 +151,7 @@ Bozza salvata Invio messaggio Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 635e8f19..9a53cb57 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -159,7 +159,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c572056c..8b9910bc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -147,7 +147,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c572056c..8b9910bc 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -147,7 +147,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 154591e1..d95fd4ca 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -159,7 +159,7 @@ Szkic zapisany Wysyłanie wiadomości Szukaj - Szukaj na serwerze + Search sender/subject/text Szukam \'%1$s\' Standardowa odpowiedź Answer name diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3d2afcd3..367dd05a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -151,7 +151,7 @@ Rascunho salvo Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index f1a81f5d..7fbf6fa6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -155,7 +155,7 @@ Ciornă salvată Expediere mesaj Caută - Căutare pe server + Search sender/subject/text Se caută \'%1$s\' Răspuns standard Titlu răspuns diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0d0b1d25..524035ec 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -159,7 +159,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 2905384e..ebd64382 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -155,7 +155,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 39a8a0de..501cea39 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -151,7 +151,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0d0b1d25..524035ec 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -159,7 +159,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c572056c..8b9910bc 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -147,7 +147,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c572056c..abcf5d7b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,175 +1,175 @@ - Copyright Ⓒ 2018 by M. Bokhorst - Service - Notifications - Errors + 版权所有 Ⓒ 2018，M. Bokhorst + 服务 + 通知 + 错误 - Synchronizing %1$d accounts + 正在同步%1$d个账户 - %1$d operations pending + 有%1$d个操作待执行 - %1$d new messages + %1$d条新消息 - %1$d unsent messages + %1$d条消息未发送 - \'%1$s\' failed - Setup - Standard replies - Operations - Legend - FAQ - Pro features - Privacy - About - Other apps - End-user license agreement - I agree - I disagree - Version %1$s - Accounts - Identities - Edit account - Edit identity - Edit folder - Setup - Manage accounts - To receive email - Manage identities - To send email - Grant permissions - To autocomplete addresses (optional) - To do - Done - Dark theme - Advanced options - Use WebView to show external links - Instead of Chrome Custom Tabs - Remove HTML formatting from messages - Compress IMAP data - Debug - Select … - Your name - Your email address - Reply to address - Optional - Linked account - Account name - Used to differentiate folders + “%1$s”失败 + 设置 + 标准回复 + 操作 + 图例 + 常见问题 + 专业版 + 隐私政策 + 关于 + 其他应用 + 最终用户许可协议 + 我同意 + 我拒绝 + 版本 %1$s + 账户 + 身份 + 编辑账户 + 编辑身份 + 编辑文件夹 + 设置 + 管理账户 + 用于接收电子邮件 + 管理身份 + 用于发送电子邮件 + 授予权限 + 用于联系人自动补全（可选） + 未设置 + 已设置 + 暗色主题 + 高级选项 + 使用应用内浏览器查看外部链接 + 而非使用 Chrome Custom Tabs + 去除邮件中的 HTML 格式 + 压缩 IMAP 数据 + 调试模式 + 选择 … + 姓名 + 电子邮件地址 + 回复地址 + 可选的 + 已绑定的账户 + 账户名称 + 用于区分文件夹 IMAP SMTP - Provider - Custom - Host name + 服务提供商 + 自定义 + 主机名称 STARTTLS - Port number - User name - Password - Select account - Instructions - Store sent messages (enable if needed only) - Keep-alive interval (minutes) - Synchronize (receive messages) - Synchronize (send messages) - Primary (default account) - Primary (default identity) - Check - Name missing - Email address missing - Account missing - Host name missing - Port number missing - User name missing - Password missing - Drafts folder missing - IDLE not supported - UIDPLUS not supported - Delete this account permanently? - Delete this identity permanently? - Synchronize (receive messages) - Synchronize (days) - Unified inbox - Inbox - Outbox - Archive - Drafts - Trash - Spam - Sent - User - Folders primary account - Message thread - No messages - link - image - Show images - Re: %1$s - Fwd: %1$s - Show thread - Mark read - Mark unread - Forward - Reply to all - Trash - Spam - Move - Archive - Reply - Moving message to %1$s - No viewer app available for %1$s - Attachment saved - Delete message permanently? - Report message as spam? - Compose - From: - To: - Reply to: - CC: - BCC: - Subject: - Your message - Save - Send - Show CC/BCC - Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt - Sender missing - Recipient missing - Attachments still loading - Draft trashed - Draft saved - Sending message - Search - Search on server - Searching \'%1$s\' - Standard reply - Answer name - Answer text - CC/BCC - Attachment - Synchronize - Primary - Disconnected - Connecting - Connected - Synchronizing - Closing - Swipe left to trash; swipe right to archive (if available); long press to mark read/unread - Understood - This is a pro feature - List of pro features - Buy - Buying pro features will allow you to use all current and future pro features and will keep this app maintained and supported - All pro features are activated - All pro features activated - Invalid response - Debug info - Please describe the problem and indicate the time of the problem: + 端口 + 用户名 + 密码 + 选择账户 + 说明 + 存储已发送的邮件（请只在需要时启用） + 间隔（分钟） + 同步（接收） + 同步（发送） + 默认账户 + 默认身份 + 检查 + 缺少名称 + 缺少邮箱地址 + 缺少账户 + 缺少主机名称 + 缺少端口 + 缺少用户名 + 缺少密码 + 缺少草稿箱 + IDLE 不受支持 + UIDPLUS 不受支持 + 确定永久删除这个账户吗？ + 确定永久删除这个身份吗？ + 同步文件夹（接收） + 同步天数 + 聚合收件箱 + 收件箱 + 发件箱 + 存档 + 草稿箱 + 回收站 + 垃圾邮件 + 已发送邮件 + 用户 + 文件夹主账户 + 邮件会话 + 没有邮件 + 链接 + 图片 + 显示图片 + 回复：%1$s + 转发：%1$s + 显示会话 + 标记为已读 + 标记为未读 + 转发 + 回复全部 + 回收站 + 垃圾邮件 + 移动 + 存档 + 回复 + 移动邮件至%1$s + 未找到能打开%1$s的应用程序 + 附件已保存 + 确定要永久删除邮件吗？ + 确定将邮件标为垃圾邮件吗？ + 新邮件 + 发件人： + 收件人： + 回复： + 抄送： + 密送： + 主题： + 您的邮件内容…… + 保存 + 发送 + 显示抄送和密送 + 添加附件 + OpenPGP 不可用 + 未找到加密邮件 + 加密 + 解密 + 缺少发件人 + 缺少收件人 + 附件加载中 + 草稿已删除 + 草稿已保存 + 正在发送邮件 + 搜索 + Search sender/subject/text + 搜索 “%1$s” + 标准回复 + 回复名称 + 回复文本 + 抄送或密送 + 附件 + 同步 + 首选 + 未连接 + 正在连接 + 已连接 + 正在同步 + 正在结束 + 向左滑掷入垃圾桶，向右滑存档（如果可用），长按切换已读状态 + 理解了 + 这是专业版功能 + 专业版功能列表 + 购买 + 购买专业版将获得现在以及未来更新中全部专业版功能，并将支持开发者维护这个应用 + 专业版功能已激活 + 专业版功能已激活 + 无效的响应 + 调试信息 + 请描述问题及问题发生的时间： diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c572056c..8b9910bc 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -147,7 +147,7 @@ Draft saved Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply Answer name diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 848a983c..90aae04c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -179,7 +179,7 @@ Sending message Search - Search on server + Search sender/subject/text Searching \'%1$s\' Standard reply