Delete drafts instead of trash

Reason: A51 NO [ALERT] Cannot MOVE messages out of the Drafts folder

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

@@ -72,7 +72,7 @@ public class FragmentAnswer extends FragmentEx {
             @Override
             public boolean onNavigationItemSelected(MenuItem menuItem) {
                 switch (menuItem.getItemId()) {
-                    case R.id.action_trash:
+                    case R.id.action_delete:
                         onActionTrash();
                         return true;
                     case R.id.action_save:
@@ -99,7 +99,7 @@ public class FragmentAnswer extends FragmentEx {
             public void onChanged(EntityAnswer answer) {
                 etName.setText(answer == null ? null : answer.name);
                 etText.setText(answer == null ? null : answer.text);
-                bottom_navigation.findViewById(R.id.action_trash).setVisibility(answer == null ? View.GONE : View.VISIBLE);
+                bottom_navigation.findViewById(R.id.action_delete).setVisibility(answer == null ? View.GONE : View.VISIBLE);
 
                 pbWait.setVisibility(View.GONE);
                 grpReady.setVisibility(View.VISIBLE);

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

@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.Manifest;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
@@ -75,6 +76,7 @@ import javax.mail.internet.InternetAddress;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.content.ContextCompat;
 import androidx.cursoradapter.widget.SimpleCursorAdapter;
@@ -226,7 +228,21 @@ public class FragmentCompose extends FragmentEx {
         bottom_navigation.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
             @Override
             public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                onAction(item.getItemId());
+                int action = item.getItemId();
+                if (action == R.id.action_delete) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+                    builder
+                            .setMessage(R.string.title_ask_delete)
+                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    onAction(R.id.action_delete);
+                                }
+                            })
+                            .setNegativeButton(android.R.string.cancel, null).show();
+
+                } else
+                    onAction(action);
                 return false;
             }
         });
@@ -960,14 +976,12 @@ public class FragmentCompose extends FragmentEx {
                 String pbody = "<pre>" + body.replaceAll("\\r?\\n", "<br />") + "</pre>";
 
                 // Execute action
-                if (action == R.id.action_trash) {
-                    draft.ui_seen = true;
+                if (action == R.id.action_delete) {
+                    draft.msgid = null;
                     draft.ui_hide = true;
                     db.message().updateMessage(draft);
-                    draft.write(context, pbody);
 
-                    EntityFolder trash = db.folder().getFolderByType(draft.account, EntityFolder.TRASH);
-                    EntityOperation.queue(db, draft, EntityOperation.MOVE, trash.id);
+                    EntityOperation.queue(db, draft, EntityOperation.DELETE);
 
                 } else if (action == R.id.action_save) {
                     db.message().updateMessage(draft);
@@ -1041,10 +1055,10 @@ public class FragmentCompose extends FragmentEx {
             Helper.setViewsEnabled(view, true);
             getActivity().invalidateOptionsMenu();
 
-            if (action == R.id.action_trash) {
+            if (action == R.id.action_delete) {
                 autosave = false;
                 getFragmentManager().popBackStack();
-                Toast.makeText(getContext(), R.string.title_draft_trashed, Toast.LENGTH_LONG).show();
+                Toast.makeText(getContext(), R.string.title_draft_deleted, Toast.LENGTH_LONG).show();
 
             } else if (action == R.id.action_save) {
                 if (draft != null)

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

@@ -289,7 +289,7 @@ public class FragmentMessage extends FragmentEx {
                     case R.id.action_spam:
                         onActionSpam();
                         return true;
-                    case R.id.action_trash:
+                    case R.id.action_delete:
                         onActionDelete();
                         return true;
                     case R.id.action_move:
@@ -465,7 +465,7 @@ public class FragmentMessage extends FragmentEx {
                         bottom_navigation.setTag(inTrash || !hasTrash || inOutbox);
 
                         bottom_navigation.getMenu().findItem(R.id.action_spam).setVisible(message.uid != null && !inArchive && !inJunk && hasJunk);
-                        bottom_navigation.getMenu().findItem(R.id.action_trash).setVisible((message.uid != null && hasTrash) || (inOutbox && !TextUtils.isEmpty(message.error)));
+                        bottom_navigation.getMenu().findItem(R.id.action_delete).setVisible((message.uid != null && hasTrash) || (inOutbox && !TextUtils.isEmpty(message.error)));
                         bottom_navigation.getMenu().findItem(R.id.action_move).setVisible(message.uid != null && (!inInbox || hasUser));
                         bottom_navigation.getMenu().findItem(R.id.action_archive).setVisible(message.uid != null && !inArchive && hasArchive);
                         bottom_navigation.getMenu().findItem(R.id.action_reply).setVisible(!inOutbox);

app/src/main/res/menu/action_answer.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_trash"
+        android:id="@+id/action_delete"
         android:icon="@drawable/baseline_delete_24"
         android:title="@string/title_trash"
         app:showAsAction="ifRoom" />

app/src/main/res/menu/action_compose.xml

@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_trash"
+        android:id="@+id/action_delete"
         android:icon="@drawable/baseline_delete_24"
-        android:title="@string/title_trash"
+        android:title="@string/title_delete"
         app:showAsAction="ifRoom" />
 
     <item

app/src/main/res/menu/action_view.xml

@@ -9,7 +9,7 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/action_trash"
+        android:id="@+id/action_delete"
         android:icon="@drawable/baseline_delete_24"
         android:title="@string/title_trash"
         app:showAsAction="ifRoom" />

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -84,6 +84,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -144,6 +145,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -168,7 +170,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -84,6 +84,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -144,6 +145,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -168,7 +170,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -84,6 +84,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -144,6 +145,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -168,7 +170,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -84,6 +84,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -144,6 +145,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -168,7 +170,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -84,6 +84,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -144,6 +145,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -168,7 +170,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -76,6 +76,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -160,7 +162,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Forbundet konto</string>
   <string name="title_account_name">Kontonavn</string>
   <string name="title_account_name_hint">Bruges til at differentiere mapper</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Udbyder</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Papirkurv</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Flyt</string>
   <string name="title_archive">Arkivér</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Afsender mangler</string>
   <string name="title_to_missing">Modtager mangler</string>
   <string name="title_attachments_missing">Vedhæftede filer indlæses stadig</string>
-  <string name="title_draft_trashed">Kladde slettet</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Kladde gemt</string>
   <string name="title_queued">Sender besked</string>
   <string name="title_search">Søg</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Verknüpftes Konto</string>
   <string name="title_account_name">Kontobezeichnung</string>
   <string name="title_account_name_hint">Wird verwendet, um Ordner zu unterscheiden</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Anbieter</string>
@@ -98,7 +99,7 @@
   <string name="title_no_uidplus">IMAP UIDPLUS wird nicht unterstützt</string>
   <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
   <string name="title_identity_delete">Möchten Sie diese Identität unwiderruflich löschen?</string>
-  <string name="title_pop">POP is not supported</string>
+  <string name="title_pop">POP wird nicht unterstützt</string>
   <string name="title_insecure">Unsichere Verbindungen werden nicht unterstützt</string>
   <string name="title_synchronize_folder">Synchronisiere (empfange E-Mails)</string>
   <string name="title_unified_folder">Im gemeinsamen Posteingang anzeigen</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Kopfzeile anzeigen</string>
   <string name="title_show_html">Original anzeigen</string>
   <string name="title_trash">Papierkorb</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Verschieben</string>
   <string name="title_archive">Archivieren</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Absender fehlt</string>
   <string name="title_to_missing">Empfänger fehlt</string>
   <string name="title_attachments_missing">Anhänge werden noch geladen</string>
-  <string name="title_draft_trashed">Entwurf gelöscht</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Entwurf gespeichert</string>
   <string name="title_queued">Nachricht senden\u2026</string>
   <string name="title_search">Suche</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Compte associé</string>
   <string name="title_account_name">Nom du compte</string>
   <string name="title_account_name_hint">Utilisé pour différencier les dossiers</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Fournisseur</string>
@@ -98,7 +99,7 @@
   <string name="title_no_uidplus">IMAP UIDPLUS non supporté</string>
   <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
   <string name="title_identity_delete">Supprimer définitivement cette identité ?</string>
-  <string name="title_pop">POP is not supported</string>
+  <string name="title_pop">POP n\'est pas supporté</string>
   <string name="title_insecure">Les connexions non sécurisées ne sont pas supportées</string>
   <string name="title_synchronize_folder">Synchroniser (recevoir des messages)</string>
   <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Afficher les en-têtes</string>
   <string name="title_show_html">Afficher l\'original</string>
   <string name="title_trash">Corbeille</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Déplacer</string>
   <string name="title_archive">Archiver</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Expéditeur manquant</string>
   <string name="title_to_missing">Destinataire manquant</string>
   <string name="title_attachments_missing">Pièces jointes en cours de chargement</string>
-  <string name="title_draft_trashed">Brouillon supprimé</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Brouillon enregistré</string>
   <string name="title_queued">Envoi du message</string>
   <string name="title_search">Rechercher</string>

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

@@ -76,6 +76,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -160,7 +162,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Account collegato</string>
   <string name="title_account_name">Nome account</string>
   <string name="title_account_name_hint">Usato per differenziare le cartelle</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Fornitore</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Cestino</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Posta indesiderata</string>
   <string name="title_move">Sposta</string>
   <string name="title_archive">Archivo</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Mittente mancante</string>
   <string name="title_to_missing">Destinatario mancante</string>
   <string name="title_attachments_missing">Allegati ancora in fase di caricamento</string>
-  <string name="title_draft_trashed">Bozza cestinata</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Bozza salvata</string>
   <string name="title_queued">Invio messaggio</string>
   <string name="title_search">Search</string>

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

@@ -76,6 +76,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -160,7 +162,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -64,6 +64,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -124,6 +125,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -148,7 +150,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -64,6 +64,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -124,6 +125,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -148,7 +150,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -76,6 +76,7 @@
   <string name="title_account_linked">Połączone konto</string>
   <string name="title_account_name">Nazwa konta</string>
   <string name="title_account_name_hint">Używany do odróżnienia folderów</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Dostawca</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Pokaż nagłówki</string>
   <string name="title_show_html">Pokaż oryginał</string>
   <string name="title_trash">Kosz</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Przenieś</string>
   <string name="title_archive">Archiwum</string>
@@ -160,7 +162,7 @@
   <string name="title_from_missing">Brak nadawcy</string>
   <string name="title_to_missing">Brak adresata</string>
   <string name="title_attachments_missing">Załączniki są wciąż ładowane</string>
-  <string name="title_draft_trashed">Szkice usunięte</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Szkic zapisany</string>
   <string name="title_queued">Wysyłanie wiadomości</string>
   <string name="title_search">Szukaj</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Linked account</string>
   <string name="title_account_name">Nome da conta</string>
   <string name="title_account_name_hint">Usada para diferenciar pastas</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provedor</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Lixeira</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Mover</string>
   <string name="title_archive">Arquivar</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Remetente faltante</string>
   <string name="title_to_missing">Destinatário faltante</string>
   <string name="title_attachments_missing">Attachments still loading</string>
-  <string name="title_draft_trashed">Rascunho excluído</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Rascunho salvo</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -72,6 +72,7 @@
   <string name="title_account_linked">Cont asociat</string>
   <string name="title_account_name">Nume cont</string>
   <string name="title_account_name_hint">Folosit la diferențierea dosarelor</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Furnizor</string>
@@ -132,6 +133,7 @@
   <string name="title_show_headers">Arată antetul</string>
   <string name="title_show_html">Arată original</string>
   <string name="title_trash">Gunoi</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Mută</string>
   <string name="title_archive">Arhivă</string>
@@ -156,7 +158,7 @@
   <string name="title_from_missing">Expeditor lipsă</string>
   <string name="title_to_missing">Destinatar lipsă</string>
   <string name="title_attachments_missing">Atașamentele încă se încarcă</string>
-  <string name="title_draft_trashed">Ciornă trimisă la gunoi</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Ciornă salvată</string>
   <string name="title_queued">Expediere mesaj</string>
   <string name="title_search">Caută</string>

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

@@ -76,6 +76,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -160,7 +162,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -72,6 +72,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -132,6 +133,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -156,7 +158,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -152,7 +154,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -68,6 +68,7 @@
   <string name="title_account_linked">Bağlı hesap</string>
   <string name="title_account_name">Hesap adı</string>
   <string name="title_account_name_hint">Klasörleri ayırt etmek için kullanılır</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Sağlayıcı</string>
@@ -128,6 +129,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Çöp Kutusu</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Taşı</string>
   <string name="title_archive">Arşivle</string>
@@ -152,7 +154,7 @@
   <string name="title_from_missing">Gönderici Eksik</string>
   <string name="title_to_missing">Alıcı eksik</string>
   <string name="title_attachments_missing">Ekler hala yükleniyor</string>
-  <string name="title_draft_trashed">Taslak çöp kutusuna atıldı</string>
+  <string name="title_draft_deleted">Draft deleted</string>
   <string name="title_draft_saved">Taslak kaydedildi</string>
   <string name="title_queued">İleti gönderiliyor</string>
   <string name="title_search">Ara</string>

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

@@ -76,6 +76,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -136,6 +137,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -160,7 +162,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -64,6 +64,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -124,6 +125,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -148,7 +150,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -64,6 +64,7 @@
   <string name="title_account_linked">已绑定的账户</string>
   <string name="title_account_name">账户名称</string>
   <string name="title_account_name_hint">用于区分文件夹</string>
+  <string name="title_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">服务提供商</string>
@@ -124,6 +125,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">回收站</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">垃圾邮件</string>
   <string name="title_move">移动</string>
   <string name="title_archive">存档</string>
@@ -148,7 +150,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">草稿已保存</string>
   <string name="title_queued">正在发送邮件</string>
   <string name="title_search">搜索</string>

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

@@ -64,6 +64,7 @@
   <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_account_signature">Signature text</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">Provider</string>
@@ -124,6 +125,7 @@
   <string name="title_show_headers">Show headers</string>
   <string name="title_show_html">Show original</string>
   <string name="title_trash">Trash</string>
+  <string name="title_delete">Delete</string>
   <string name="title_spam">Spam</string>
   <string name="title_move">Move</string>
   <string name="title_archive">Archive</string>
@@ -148,7 +150,7 @@
   <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_deleted">Draft deleted</string>
   <string name="title_draft_saved">Draft saved</string>
   <string name="title_queued">Sending message</string>
   <string name="title_search">Search</string>

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

@@ -151,6 +151,7 @@
     <string name="title_show_html">Show original</string>
 
     <string name="title_trash">Trash</string>
+    <string name="title_delete">Delete</string>
     <string name="title_spam">Spam</string>
     <string name="title_move">Move</string>
     <string name="title_archive">Archive</string>
@@ -179,7 +180,7 @@
     <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_deleted">Draft deleted</string>
     <string name="title_draft_saved">Draft saved</string>
     <string name="title_queued">Sending message</string>