From 164129f09d1941f1d210fc8b223d8b19a227aa49 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 7 Sep 2018 09:02:45 +0000 Subject: [PATCH] Delete drafts instead of trash Reason: A51 NO [ALERT] Cannot MOVE messages out of the Drafts folder --- .../eu/faircode/email/FragmentAnswer.java | 4 +-- .../eu/faircode/email/FragmentCompose.java | 30 ++++++++++++++----- .../eu/faircode/email/FragmentMessage.java | 4 +-- app/src/main/res/menu/action_answer.xml | 2 +- app/src/main/res/menu/action_compose.xml | 4 +-- app/src/main/res/menu/action_view.xml | 2 +- app/src/main/res/values-af/strings.xml | 4 ++- app/src/main/res/values-ar-rBH/strings.xml | 4 ++- app/src/main/res/values-ar-rEG/strings.xml | 4 ++- app/src/main/res/values-ar-rSA/strings.xml | 4 ++- app/src/main/res/values-ar-rYE/strings.xml | 4 ++- app/src/main/res/values-ar/strings.xml | 4 ++- app/src/main/res/values-ca/strings.xml | 4 ++- app/src/main/res/values-cs/strings.xml | 4 ++- app/src/main/res/values-da/strings.xml | 4 ++- app/src/main/res/values-de/strings.xml | 6 ++-- app/src/main/res/values-el/strings.xml | 4 ++- app/src/main/res/values-en/strings.xml | 4 ++- app/src/main/res/values-es-rES/strings.xml | 4 ++- app/src/main/res/values-fi/strings.xml | 4 ++- app/src/main/res/values-fr/strings.xml | 6 ++-- app/src/main/res/values-he/strings.xml | 4 ++- app/src/main/res/values-hu/strings.xml | 4 ++- app/src/main/res/values-it/strings.xml | 4 ++- app/src/main/res/values-iw/strings.xml | 4 ++- app/src/main/res/values-ja/strings.xml | 4 ++- app/src/main/res/values-ko/strings.xml | 4 ++- app/src/main/res/values-nb/strings.xml | 4 ++- app/src/main/res/values-nl/strings.xml | 4 ++- app/src/main/res/values-no/strings.xml | 4 ++- app/src/main/res/values-pl/strings.xml | 4 ++- app/src/main/res/values-pt-rBR/strings.xml | 4 ++- app/src/main/res/values-pt-rPT/strings.xml | 4 ++- app/src/main/res/values-ro/strings.xml | 4 ++- app/src/main/res/values-ru/strings.xml | 4 ++- app/src/main/res/values-sr/strings.xml | 4 ++- app/src/main/res/values-sv-rSE/strings.xml | 4 ++- app/src/main/res/values-tr/strings.xml | 4 ++- app/src/main/res/values-uk/strings.xml | 4 ++- app/src/main/res/values-vi/strings.xml | 4 ++- app/src/main/res/values-zh-rCN/strings.xml | 4 ++- app/src/main/res/values-zh-rTW/strings.xml | 4 ++- app/src/main/res/values/strings.xml | 3 +- 43 files changed, 142 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index 15e552cf..00c0e9c3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/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); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index c6d3d49c..1a85e0fd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/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 = "
" + body.replaceAll("\\r?\\n", "
") + "
"; // 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) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index d75803e6..c3b65065 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/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); diff --git a/app/src/main/res/menu/action_answer.xml b/app/src/main/res/menu/action_answer.xml index 322812f0..58f464d9 100644 --- a/app/src/main/res/menu/action_answer.xml +++ b/app/src/main/res/menu/action_answer.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/action_compose.xml b/app/src/main/res/menu/action_compose.xml index 9b8f1ad7..99f0d217 100644 --- a/app/src/main/res/menu/action_compose.xml +++ b/app/src/main/res/menu/action_compose.xml @@ -3,9 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 67d9e047..ea2ddaf4 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -84,6 +84,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -144,6 +145,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -168,7 +170,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 67d9e047..ea2ddaf4 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -84,6 +84,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -144,6 +145,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -168,7 +170,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 67d9e047..ea2ddaf4 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -84,6 +84,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -144,6 +145,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -168,7 +170,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 67d9e047..ea2ddaf4 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -84,6 +84,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -144,6 +145,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -168,7 +170,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 67d9e047..ea2ddaf4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -84,6 +84,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -144,6 +145,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -168,7 +170,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 84a1e873..f42442a1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -76,6 +76,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -136,6 +137,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -160,7 +162,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a37a5e64..73dc7896 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -68,6 +68,7 @@ Forbundet konto Kontonavn Bruges til at differentiere mapper + Signature text IMAP SMTP Udbyder @@ -128,6 +129,7 @@ Show headers Show original Papirkurv + Delete Spam Flyt Arkivér @@ -152,7 +154,7 @@ Afsender mangler Modtager mangler Vedhæftede filer indlæses stadig - Kladde slettet + Draft deleted Kladde gemt Sender besked Søg diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f719f1a2..b6ec7930 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -68,6 +68,7 @@ Verknüpftes Konto Kontobezeichnung Wird verwendet, um Ordner zu unterscheiden + Signature text IMAP SMTP Anbieter @@ -98,7 +99,7 @@ IMAP UIDPLUS wird nicht unterstützt Möchten Sie dieses Konto unwiderruflich löschen? Möchten Sie diese Identität unwiderruflich löschen? - POP is not supported + POP wird nicht unterstützt Unsichere Verbindungen werden nicht unterstützt Synchronisiere (empfange E-Mails) Im gemeinsamen Posteingang anzeigen @@ -128,6 +129,7 @@ Kopfzeile anzeigen Original anzeigen Papierkorb + Delete Spam Verschieben Archivieren @@ -152,7 +154,7 @@ Absender fehlt Empfänger fehlt Anhänge werden noch geladen - Entwurf gelöscht + Draft deleted Entwurf gespeichert Nachricht senden\u2026 Suche diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 88793860..05c6926f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -68,6 +68,7 @@ Compte associé Nom du compte Utilisé pour différencier les dossiers + Signature text IMAP SMTP Fournisseur @@ -98,7 +99,7 @@ IMAP UIDPLUS non supporté Supprimer définitivement ce compte ? Supprimer définitivement cette identité ? - POP is not supported + POP n\'est pas supporté Les connexions non sécurisées ne sont pas supportées Synchroniser (recevoir des messages) Afficher dans la boîte de réception unifiée @@ -128,6 +129,7 @@ Afficher les en-têtes Afficher l\'original Corbeille + Delete Spam Déplacer Archiver @@ -152,7 +154,7 @@ Expéditeur manquant Destinataire manquant Pièces jointes en cours de chargement - Brouillon supprimé + Draft deleted Brouillon enregistré Envoi du message Rechercher diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index be686387..11b0c025 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -76,6 +76,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -136,6 +137,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -160,7 +162,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7cc9ecf6..31328cc5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -68,6 +68,7 @@ Account collegato Nome account Usato per differenziare le cartelle + Signature text IMAP SMTP Fornitore @@ -128,6 +129,7 @@ Show headers Show original Cestino + Delete Posta indesiderata Sposta Archivo @@ -152,7 +154,7 @@ Mittente mancante Destinatario mancante Allegati ancora in fase di caricamento - Bozza cestinata + Draft deleted Bozza salvata Invio messaggio Search diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index be686387..11b0c025 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -76,6 +76,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -136,6 +137,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -160,7 +162,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c3c74750..a8ba5113 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -64,6 +64,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -124,6 +125,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -148,7 +150,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c3c74750..a8ba5113 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -64,6 +64,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -124,6 +125,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -148,7 +150,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f7ce4a2a..a734b6c1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -76,6 +76,7 @@ Połączone konto Nazwa konta Używany do odróżnienia folderów + Signature text IMAP SMTP Dostawca @@ -136,6 +137,7 @@ Pokaż nagłówki Pokaż oryginał Kosz + Delete Spam Przenieś Archiwum @@ -160,7 +162,7 @@ Brak nadawcy Brak adresata Załączniki są wciąż ładowane - Szkice usunięte + Draft deleted Szkic zapisany Wysyłanie wiadomości Szukaj diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c880f687..21b4b65a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -68,6 +68,7 @@ Linked account Nome da conta Usada para diferenciar pastas + Signature text IMAP SMTP Provedor @@ -128,6 +129,7 @@ Show headers Show original Lixeira + Delete Spam Mover Arquivar @@ -152,7 +154,7 @@ Remetente faltante Destinatário faltante Attachments still loading - Rascunho excluído + Draft deleted Rascunho salvo Sending message Search diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 35158eef..80133408 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -72,6 +72,7 @@ Cont asociat Nume cont Folosit la diferențierea dosarelor + Signature text IMAP SMTP Furnizor @@ -132,6 +133,7 @@ Arată antetul Arată original Gunoi + Delete Spam Mută Arhivă @@ -156,7 +158,7 @@ Expeditor lipsă Destinatar lipsă Atașamentele încă se încarcă - Ciornă trimisă la gunoi + Draft deleted Ciornă salvată Expediere mesaj Caută diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 84a1e873..f42442a1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -76,6 +76,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -136,6 +137,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -160,7 +162,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 9500b5fe..91b066ca 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -72,6 +72,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -132,6 +133,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -156,7 +158,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index b11ed739..788e819d 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -68,6 +68,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -128,6 +129,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -152,7 +154,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 25c44f3d..2b27ad5c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -68,6 +68,7 @@ Bağlı hesap Hesap adı Klasörleri ayırt etmek için kullanılır + Signature text IMAP SMTP Sağlayıcı @@ -128,6 +129,7 @@ Show headers Show original Çöp Kutusu + Delete Spam Taşı Arşivle @@ -152,7 +154,7 @@ Gönderici Eksik Alıcı eksik Ekler hala yükleniyor - Taslak çöp kutusuna atıldı + Draft deleted Taslak kaydedildi İleti gönderiliyor Ara diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 84a1e873..f42442a1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -76,6 +76,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -136,6 +137,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -160,7 +162,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c3c74750..a8ba5113 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -64,6 +64,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -124,6 +125,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -148,7 +150,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2fa532ce..3bc27e3a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -64,6 +64,7 @@ 已绑定的账户 账户名称 用于区分文件夹 + Signature text IMAP SMTP 服务提供商 @@ -124,6 +125,7 @@ Show headers Show original 回收站 + Delete 垃圾邮件 移动 存档 @@ -148,7 +150,7 @@ 缺少发件人 缺少收件人 附件加载中 - 草稿已删除 + Draft deleted 草稿已保存 正在发送邮件 搜索 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c3c74750..a8ba5113 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -64,6 +64,7 @@ Linked account Account name Used to differentiate folders + Signature text IMAP SMTP Provider @@ -124,6 +125,7 @@ Show headers Show original Trash + Delete Spam Move Archive @@ -148,7 +150,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message Search diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa46bc1f..7738fc55 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -151,6 +151,7 @@ Show original Trash + Delete Spam Move Archive @@ -179,7 +180,7 @@ Sender missing Recipient missing Attachments still loading - Draft trashed + Draft deleted Draft saved Sending message