From 017fc8e59feaedaac298ac8886534ebc2ded7338 Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 14 Nov 2022 17:54:20 +0100 Subject: [PATCH] Respect font size settings in message view - Remove now unnecessary settings. - Rearrange items in the settings screen to match the display order in the message view screen. - Change setting name from "To" to "Recipients". --- .../src/main/java/com/fsck/k9/FontSizes.java | 57 +++---------------- .../k9/activity/MessageListActivityConfig.kt | 10 +--- .../general/GeneralSettingsDataStore.kt | 10 +--- .../java/com/fsck/k9/view/MessageHeader.java | 13 +++++ .../legacy/src/main/res/values-ar/strings.xml | 3 - .../legacy/src/main/res/values-be/strings.xml | 4 -- .../legacy/src/main/res/values-bg/strings.xml | 4 -- .../legacy/src/main/res/values-br/strings.xml | 4 -- .../legacy/src/main/res/values-ca/strings.xml | 4 -- .../legacy/src/main/res/values-cs/strings.xml | 4 -- .../legacy/src/main/res/values-cy/strings.xml | 4 -- .../legacy/src/main/res/values-da/strings.xml | 4 -- .../legacy/src/main/res/values-de/strings.xml | 4 -- .../legacy/src/main/res/values-el/strings.xml | 4 -- .../legacy/src/main/res/values-eo/strings.xml | 4 -- .../legacy/src/main/res/values-es/strings.xml | 4 -- .../legacy/src/main/res/values-et/strings.xml | 4 -- .../legacy/src/main/res/values-eu/strings.xml | 4 -- .../legacy/src/main/res/values-fa/strings.xml | 4 -- .../legacy/src/main/res/values-fi/strings.xml | 4 -- .../legacy/src/main/res/values-fr/strings.xml | 4 -- .../legacy/src/main/res/values-fy/strings.xml | 4 -- .../legacy/src/main/res/values-gd/strings.xml | 4 -- .../src/main/res/values-gl-rES/strings.xml | 4 -- .../legacy/src/main/res/values-gl/strings.xml | 4 -- .../legacy/src/main/res/values-hr/strings.xml | 4 -- .../legacy/src/main/res/values-hu/strings.xml | 4 -- .../legacy/src/main/res/values-in/strings.xml | 4 -- .../legacy/src/main/res/values-is/strings.xml | 4 -- .../legacy/src/main/res/values-it/strings.xml | 4 -- .../legacy/src/main/res/values-iw/strings.xml | 4 -- .../legacy/src/main/res/values-ja/strings.xml | 4 -- .../legacy/src/main/res/values-ko/strings.xml | 4 -- .../legacy/src/main/res/values-lt/strings.xml | 4 -- .../legacy/src/main/res/values-lv/strings.xml | 4 -- .../legacy/src/main/res/values-ml/strings.xml | 4 -- .../legacy/src/main/res/values-nb/strings.xml | 4 -- .../legacy/src/main/res/values-nl/strings.xml | 4 -- .../legacy/src/main/res/values-pl/strings.xml | 4 -- .../src/main/res/values-pt-rBR/strings.xml | 4 -- .../src/main/res/values-pt-rPT/strings.xml | 4 -- .../legacy/src/main/res/values-ro/strings.xml | 4 -- .../legacy/src/main/res/values-ru/strings.xml | 4 -- .../legacy/src/main/res/values-sk/strings.xml | 4 -- .../legacy/src/main/res/values-sl/strings.xml | 4 -- .../legacy/src/main/res/values-sq/strings.xml | 4 -- .../legacy/src/main/res/values-sr/strings.xml | 4 -- .../legacy/src/main/res/values-sv/strings.xml | 4 -- .../legacy/src/main/res/values-tr/strings.xml | 4 -- .../legacy/src/main/res/values-uk/strings.xml | 4 -- .../src/main/res/values-zh-rCN/strings.xml | 4 -- .../src/main/res/values-zh-rTW/strings.xml | 4 -- app/ui/legacy/src/main/res/values/strings.xml | 5 +- .../src/main/res/xml/general_settings.xml | 46 ++++----------- 54 files changed, 38 insertions(+), 294 deletions(-) diff --git a/app/core/src/main/java/com/fsck/k9/FontSizes.java b/app/core/src/main/java/com/fsck/k9/FontSizes.java index 9e80e6281..13632d8a6 100644 --- a/app/core/src/main/java/com/fsck/k9/FontSizes.java +++ b/app/core/src/main/java/com/fsck/k9/FontSizes.java @@ -21,10 +21,7 @@ public class FontSizes { private static final String MESSAGE_LIST_DATE = "fontSizeMessageListDate"; private static final String MESSAGE_LIST_PREVIEW = "fontSizeMessageListPreview"; private static final String MESSAGE_VIEW_SENDER = "fontSizeMessageViewSender"; - private static final String MESSAGE_VIEW_TO = "fontSizeMessageViewTo"; - private static final String MESSAGE_VIEW_CC = "fontSizeMessageViewCC"; - private static final String MESSAGE_VIEW_BCC = "fontSizeMessageViewBCC"; - private static final String MESSAGE_VIEW_ADDITIONAL_HEADERS = "fontSizeMessageViewAdditionalHeaders"; + private static final String MESSAGE_VIEW_RECIPIENTS = "fontSizeMessageViewTo"; private static final String MESSAGE_VIEW_SUBJECT = "fontSizeMessageViewSubject"; private static final String MESSAGE_VIEW_DATE = "fontSizeMessageViewDate"; private static final String MESSAGE_VIEW_CONTENT_PERCENT = "fontSizeMessageViewContentPercent"; @@ -50,10 +47,7 @@ public class FontSizes { private int messageListDate; private int messageListPreview; private int messageViewSender; - private int messageViewTo; - private int messageViewCC; - private int messageViewBCC; - private int messageViewAdditionalHeaders; + private int messageViewRecipients; private int messageViewSubject; private int messageViewDate; private int messageViewContentPercent; @@ -73,10 +67,7 @@ public class FontSizes { messageListPreview = FONT_DEFAULT; messageViewSender = FONT_DEFAULT; - messageViewTo = FONT_DEFAULT; - messageViewCC = FONT_DEFAULT; - messageViewBCC = FONT_DEFAULT; - messageViewAdditionalHeaders = FONT_DEFAULT; + messageViewRecipients = FONT_DEFAULT; messageViewSubject = FONT_DEFAULT; messageViewDate = FONT_DEFAULT; messageViewContentPercent = 100; @@ -97,10 +88,7 @@ public class FontSizes { editor.putInt(MESSAGE_LIST_PREVIEW, messageListPreview); editor.putInt(MESSAGE_VIEW_SENDER, messageViewSender); - editor.putInt(MESSAGE_VIEW_TO, messageViewTo); - editor.putInt(MESSAGE_VIEW_CC, messageViewCC); - editor.putInt(MESSAGE_VIEW_BCC, messageViewBCC); - editor.putInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders); + editor.putInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients); editor.putInt(MESSAGE_VIEW_SUBJECT, messageViewSubject); editor.putInt(MESSAGE_VIEW_DATE, messageViewDate); editor.putInt(MESSAGE_VIEW_CONTENT_PERCENT, getMessageViewContentAsPercent()); @@ -121,10 +109,7 @@ public class FontSizes { messageListPreview = storage.getInt(MESSAGE_LIST_PREVIEW, messageListPreview); messageViewSender = storage.getInt(MESSAGE_VIEW_SENDER, messageViewSender); - messageViewTo = storage.getInt(MESSAGE_VIEW_TO, messageViewTo); - messageViewCC = storage.getInt(MESSAGE_VIEW_CC, messageViewCC); - messageViewBCC = storage.getInt(MESSAGE_VIEW_BCC, messageViewBCC); - messageViewAdditionalHeaders = storage.getInt(MESSAGE_VIEW_ADDITIONAL_HEADERS, messageViewAdditionalHeaders); + messageViewRecipients = storage.getInt(MESSAGE_VIEW_RECIPIENTS, messageViewRecipients); messageViewSubject = storage.getInt(MESSAGE_VIEW_SUBJECT, messageViewSubject); messageViewDate = storage.getInt(MESSAGE_VIEW_DATE, messageViewDate); @@ -209,36 +194,12 @@ public class FontSizes { this.messageViewSender = messageViewSender; } - public int getMessageViewTo() { - return messageViewTo; + public int getMessageViewRecipients() { + return messageViewRecipients; } - public void setMessageViewTo(int messageViewTo) { - this.messageViewTo = messageViewTo; - } - - public int getMessageViewCC() { - return messageViewCC; - } - - public void setMessageViewCC(int messageViewCC) { - this.messageViewCC = messageViewCC; - } - - public int getMessageViewBCC() { - return messageViewBCC; - } - - public void setMessageViewBCC(int messageViewBCC) { - this.messageViewBCC = messageViewBCC; - } - - public int getMessageViewAdditionalHeaders() { - return messageViewAdditionalHeaders; - } - - public void setMessageViewAdditionalHeaders(int messageViewAdditionalHeaders) { - this.messageViewAdditionalHeaders = messageViewAdditionalHeaders; + public void setMessageViewRecipients(int messageViewRecipients) { + this.messageViewRecipients = messageViewRecipients; } public int getMessageViewSubject() { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt index fc2ebd1ec..1f910f91e 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt @@ -26,10 +26,7 @@ data class MessageListActivityConfig( val fontSizeMessageListDate: Int, val fontSizeMessageListPreview: Int, val fontSizeMessageViewSender: Int, - val fontSizeMessageViewTo: Int, - val fontSizeMessageViewCC: Int, - val fontSizeMessageViewBCC: Int, - val fontSizeMessageViewAdditionalHeaders: Int, + val fontSizeMessageViewRecipients: Int, val fontSizeMessageViewSubject: Int, val fontSizeMessageViewDate: Int, val fontSizeMessageViewContentAsPercent: Int, @@ -60,10 +57,7 @@ data class MessageListActivityConfig( fontSizeMessageListDate = K9.fontSizes.messageListDate, fontSizeMessageListPreview = K9.fontSizes.messageListPreview, fontSizeMessageViewSender = K9.fontSizes.messageViewSender, - fontSizeMessageViewTo = K9.fontSizes.messageViewTo, - fontSizeMessageViewCC = K9.fontSizes.messageViewCC, - fontSizeMessageViewBCC = K9.fontSizes.messageViewBCC, - fontSizeMessageViewAdditionalHeaders = K9.fontSizes.messageViewAdditionalHeaders, + fontSizeMessageViewRecipients = K9.fontSizes.messageViewRecipients, fontSizeMessageViewSubject = K9.fontSizes.messageViewSubject, fontSizeMessageViewDate = K9.fontSizes.messageViewDate, fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent, diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt index 6e1ae5a9c..385889aef 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt @@ -119,12 +119,9 @@ class GeneralSettingsDataStore( "message_list_date_font" -> K9.fontSizes.messageListDate.toString() "message_list_preview_font" -> K9.fontSizes.messageListPreview.toString() "message_view_sender_font" -> K9.fontSizes.messageViewSender.toString() - "message_view_to_font" -> K9.fontSizes.messageViewTo.toString() - "message_view_cc_font" -> K9.fontSizes.messageViewCC.toString() - "message_view_bcc_font" -> K9.fontSizes.messageViewBCC.toString() + "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients.toString() "message_view_subject_font" -> K9.fontSizes.messageViewSubject.toString() "message_view_date_font" -> K9.fontSizes.messageViewDate.toString() - "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders.toString() "message_compose_input_font" -> K9.fontSizes.messageComposeInput.toString() "swipe_action_right" -> swipeActionToString(K9.swipeRightAction) "swipe_action_left" -> swipeActionToString(K9.swipeLeftAction) @@ -160,12 +157,9 @@ class GeneralSettingsDataStore( "message_list_date_font" -> K9.fontSizes.messageListDate = value.toInt() "message_list_preview_font" -> K9.fontSizes.messageListPreview = value.toInt() "message_view_sender_font" -> K9.fontSizes.messageViewSender = value.toInt() - "message_view_to_font" -> K9.fontSizes.messageViewTo = value.toInt() - "message_view_cc_font" -> K9.fontSizes.messageViewCC = value.toInt() - "message_view_bcc_font" -> K9.fontSizes.messageViewBCC = value.toInt() + "message_view_recipients_font" -> K9.fontSizes.messageViewRecipients = value.toInt() "message_view_subject_font" -> K9.fontSizes.messageViewSubject = value.toInt() "message_view_date_font" -> K9.fontSizes.messageViewDate = value.toInt() - "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders = value.toInt() "message_compose_input_font" -> K9.fontSizes.messageComposeInput = value.toInt() "swipe_action_right" -> K9.swipeRightAction = stringToSwipeAction(value) "swipe_action_left" -> K9.swipeLeftAction = stringToSwipeAction(value) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java index 238ba0332..94afcd61d 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java @@ -17,6 +17,7 @@ import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu.OnMenuItemClickListener; import com.fsck.k9.Account; import com.fsck.k9.DI; +import com.fsck.k9.FontSizes; import com.fsck.k9.K9; import com.fsck.k9.activity.misc.ContactPicture; import com.fsck.k9.contacts.ContactPictureLoader; @@ -34,12 +35,16 @@ import com.google.android.material.snackbar.Snackbar; public class MessageHeader extends LinearLayout implements OnClickListener, OnLongClickListener { private static final int DEFAULT_SUBJECT_LINES = 3; + private final FontSizes fontSizes = K9.getFontSizes(); + private Chip accountChip; private TextView subjectView; private ImageView starView; private ImageView contactPictureView; private TextView fromView; private ImageView cryptoStatusIcon; + private TextView toView; + private TextView toCountView; private TextView dateView; private MessageHelper messageHelper; @@ -67,8 +72,16 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo contactPictureView = findViewById(R.id.contact_picture); fromView = findViewById(R.id.from); cryptoStatusIcon = findViewById(R.id.crypto_status_icon); + toView = findViewById(R.id.to); + toCountView = findViewById(R.id.to_count); dateView = findViewById(R.id.date); + fontSizes.setViewTextSize(subjectView, fontSizes.getMessageViewSubject()); + fontSizes.setViewTextSize(dateView, fontSizes.getMessageViewDate()); + fontSizes.setViewTextSize(fromView, fontSizes.getMessageViewSender()); + fontSizes.setViewTextSize(toView, fontSizes.getMessageViewRecipients()); + fontSizes.setViewTextSize(toCountView, fontSizes.getMessageViewRecipients()); + subjectView.setOnClickListener(this); subjectView.setOnLongClickListener(this); diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml index ea33024ac..539cee718 100644 --- a/app/ui/legacy/src/main/res/values-ar/strings.xml +++ b/app/ui/legacy/src/main/res/values-ar/strings.xml @@ -605,9 +605,6 @@ معاينة رسائل مُرسِل - إلى - نسخة - ترويسات إضافية العنوان الوقت والتاريخ نصّ الرسالة diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml index eba907b60..35f374e09 100644 --- a/app/ui/legacy/src/main/res/values-be/strings.xml +++ b/app/ui/legacy/src/main/res/values-be/strings.xml @@ -668,10 +668,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к Папярэдні прагляд Паведамленне Адпраўнік - Каму - Копія - Схаваная копія - Дадатковыя загалоўкі Тэма Час і дата Цела ліста diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml index 17e2572fe..b2b4ab11c 100644 --- a/app/ui/legacy/src/main/res/values-bg/strings.xml +++ b/app/ui/legacy/src/main/res/values-bg/strings.xml @@ -665,10 +665,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр Преглед Съобщения Изпращач - До - Cc - Bcc - Допълнителни header-и Тема Дата и час Тяло на съобщението diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml index 6b8e2340a..e2caa559d 100644 --- a/app/ui/legacy/src/main/res/values-br/strings.xml +++ b/app/ui/legacy/src/main/res/values-br/strings.xml @@ -636,10 +636,6 @@ Danevellit beugoù, kenlabourit war keweriusterioù nevez ha savit goulennoù wa Alberz Kemennadennoù Kaser - Da - Cc - Bcc - Talbennoù ouzhpenn Danvez Eur ha deiziad Korf ar gemennadenn diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml index 9ba2ceae1..15a6b7ebb 100644 --- a/app/ui/legacy/src/main/res/values-ca/strings.xml +++ b/app/ui/legacy/src/main/res/values-ca/strings.xml @@ -730,10 +730,6 @@ Si us plau, envieu informes d\'errors, contribuïu-hi amb noves millores i feu p Vista prèvia Missatges Remitent - A - A/c - C/o - Capçaleres addicionals Assumpte Data i hora Cos del missatge diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml index f480a72be..d8d54e58a 100644 --- a/app/ui/legacy/src/main/res/values-cs/strings.xml +++ b/app/ui/legacy/src/main/res/values-cs/strings.xml @@ -727,10 +727,6 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví Náhled Zpráva Odesílatel - Příjemce (Komu) - Příjemce (Kopie) - Skrytá kopie - Další záhlaví Předmět Datum a čas Tělo diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml index e16f5757b..5c543f2c8 100644 --- a/app/ui/legacy/src/main/res/values-cy/strings.xml +++ b/app/ui/legacy/src/main/res/values-cy/strings.xml @@ -729,10 +729,6 @@ Plîs rho wybod am unrhyw wallau, syniadau am nodweddion newydd, neu ofyn cwesti Rhagolwg Negeseuon Anfonwr - At - Cc - Bcc - Penynnau ychwanegol Pwnc Amser a dyddiad Corff neges diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml index 15c425868..2ef14c6e2 100644 --- a/app/ui/legacy/src/main/res/values-da/strings.xml +++ b/app/ui/legacy/src/main/res/values-da/strings.xml @@ -694,10 +694,6 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på: Forhåndsvisning Meddelelse Afsender - Modtagere (Til) - Modtagere (Cc) - Bcc - Yderligere headere Emne Tid og dato Indhold diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml index 1dbb9674a..bcf2c2e5b 100644 --- a/app/ui/legacy/src/main/res/values-de/strings.xml +++ b/app/ui/legacy/src/main/res/values-de/strings.xml @@ -730,10 +730,6 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag Vorschau Nachrichtenanzeige Absender - Empfänger (To) - Empfänger (CC) - Blindkopie (BCC) - Zusätzliche Header Betreff Uhrzeit und Datum Nachrichtentext diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml index 8337b1efa..dc4353153 100644 --- a/app/ui/legacy/src/main/res/values-el/strings.xml +++ b/app/ui/legacy/src/main/res/values-el/strings.xml @@ -725,10 +725,6 @@ Προεπισκόπηση Μηνύματα Αποστολέας - Προς - Κοινοποίηση - Κρυφή Κοιν: - Επιπλέον επικεφαλίδες Θέμα Ώρα και Ημερομηνία Σώμα μηνύματος diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml index 42355790e..7e8bb9fa8 100644 --- a/app/ui/legacy/src/main/res/values-eo/strings.xml +++ b/app/ui/legacy/src/main/res/values-eo/strings.xml @@ -683,10 +683,6 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per Antaŭmontro Mesaĝoj Sendinto - Ricevonto - Ricevonto de kopio - Kaŝkopio - Aldonaj kapoj Temo Tempo kaj dato Mesaĝa enhavo diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml index 2b785a6f0..ca3d04517 100644 --- a/app/ui/legacy/src/main/res/values-es/strings.xml +++ b/app/ui/legacy/src/main/res/values-es/strings.xml @@ -730,10 +730,6 @@ Puedes informar de fallos, contribuir con su desarrollo y hacer preguntas en Previsualizar Mensajes Remitente - Para - Cc - Cco - Encabezados adicionales Asunto Hora y fecha Cuerpo de mensaje diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml index 36f0b1cca..ede6d328e 100644 --- a/app/ui/legacy/src/main/res/values-et/strings.xml +++ b/app/ui/legacy/src/main/res/values-et/strings.xml @@ -726,10 +726,6 @@ Veateated saad saata, kaastööd teha ning küsida teavet järgmisel lehel: Eelvaade Kirjad Saatja - Kellele - Koopia - Pimekoopia - Täiendavad pealkirjad Teema Kellaaeg ja kuupäev Kirja põhiosa diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml index 78bafc498..109baefa2 100644 --- a/app/ui/legacy/src/main/res/values-eu/strings.xml +++ b/app/ui/legacy/src/main/res/values-eu/strings.xml @@ -729,10 +729,6 @@ Mesedez akatsen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko Aurreikusi Mezuak Bidaltzailea - Nori - Cc - Bcc - Goiburu osagarriak Gaia Ordua eta data Mezuaren gorputza diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml index 08bfd2eb4..66f211d6e 100644 --- a/app/ui/legacy/src/main/res/values-fa/strings.xml +++ b/app/ui/legacy/src/main/res/values-fa/strings.xml @@ -723,10 +723,6 @@ پیش‌نمایش پیام‌ها فرستنده - به - رونوشت به - مخفیانه به - سرایندهای اضافی موضوع ساعت و تاریخ متن پیام diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml index c5ba53382..3cd5aae68 100644 --- a/app/ui/legacy/src/main/res/values-fi/strings.xml +++ b/app/ui/legacy/src/main/res/values-fi/strings.xml @@ -729,10 +729,6 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees Esikatselu Viestinäkymä Lähettäjä - Vastaanottaja - Kopio - Piilokopio - Tarkemmat otsikkotiedot Viestin aihe Aika ja päivämäärä Viestin sisältö diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml index b758d68ee..0d3ba86c1 100644 --- a/app/ui/legacy/src/main/res/values-fr/strings.xml +++ b/app/ui/legacy/src/main/res/values-fr/strings.xml @@ -733,10 +733,6 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions Aperçu Courriels Expéditeur - À - Cc - Cci - En-têtes supplémentaires Objet Horodatage Corps du courriel diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml index f8b9189fe..c436f3d2c 100644 --- a/app/ui/legacy/src/main/res/values-fy/strings.xml +++ b/app/ui/legacy/src/main/res/values-fy/strings.xml @@ -725,10 +725,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op Foarbyld Berjochten Ofstjoerder - Oan - Cc - Bcc - Ekstra koppen Underwerp Tiid en datum Berichtynhâld diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml index 2874a726d..ce0ec1a2b 100644 --- a/app/ui/legacy/src/main/res/values-gd/strings.xml +++ b/app/ui/legacy/src/main/res/values-gd/strings.xml @@ -631,10 +631,6 @@ Ro-shealladh Teachdaireachdan Seòladair - Gu - Cc - Bcc - Bannan-cinn a bharrachd Cuspair Ceann-là ’s àm Bodhaig na teachdaireachd diff --git a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml index a8e9c4071..9cf98da8e 100644 --- a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml +++ b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml @@ -536,10 +536,6 @@ Previsualización Mensaxes Remitente - Para - Cc - Bcc - Cabeceiras adicionais Asunto Hora e data Corpo da mensaxe diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml index 44e9ac4c4..82b4c8fbd 100644 --- a/app/ui/legacy/src/main/res/values-gl/strings.xml +++ b/app/ui/legacy/src/main/res/values-gl/strings.xml @@ -689,10 +689,6 @@ Por favor envíen informes de fallos, contribúa con novas características e co Vista previa mensaxes Remitente - Para - Cc - CCo - Encabezados adicionáis Asunto Data e Hora Corpo da mensaxe diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml index 64a0ad452..1336645ec 100644 --- a/app/ui/legacy/src/main/res/values-hr/strings.xml +++ b/app/ui/legacy/src/main/res/values-hr/strings.xml @@ -627,10 +627,6 @@ Pedpregled Poruke Pošiljatelj - Za - Cc - Bcc - Dodatna zaglavlja Subjekt Vrijeme i datum Tijelo poruke diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml index 7066a303f..13c5d0c8a 100644 --- a/app/ui/legacy/src/main/res/values-hu/strings.xml +++ b/app/ui/legacy/src/main/res/values-hu/strings.xml @@ -721,10 +721,6 @@ Hibajelentések beküldésével közreműködhet az új funkciókban, és kérd Előnézet Üzenetek Feladó - Címzett - Másolat - Titkos másolat - További fejlécek Tárgy Idő és dátum Üzenet törzse diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml index 255b93aad..4a553e68e 100644 --- a/app/ui/legacy/src/main/res/values-in/strings.xml +++ b/app/ui/legacy/src/main/res/values-in/strings.xml @@ -663,10 +663,6 @@ Kirimkan laporan bug, kontribusikan fitur baru dan ajukan pertanyaan di Pratinjau Pesan Pengirim - Kepada - Cc - Bcc - Header tambahan Subyek Tanggal dan waktu Isi pesan diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml index 8b1c35ce7..ace513045 100644 --- a/app/ui/legacy/src/main/res/values-is/strings.xml +++ b/app/ui/legacy/src/main/res/values-is/strings.xml @@ -724,10 +724,6 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á Forskoðun Skilaboð Sendandi - Til - Afrit - Falið afrit - Viðbótarhausar Viðfangsefni Tími og dagsetning Efni skilaboða diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml index 0de163288..2655c6cab 100644 --- a/app/ui/legacy/src/main/res/values-it/strings.xml +++ b/app/ui/legacy/src/main/res/values-it/strings.xml @@ -726,10 +726,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s Anteprima Messaggi Mittente - A - Cc - Ccn - Intestazioni aggiuntive Oggetto Ora e data Corpo del messaggio diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml index db44e38f6..7ccf3756e 100644 --- a/app/ui/legacy/src/main/res/values-iw/strings.xml +++ b/app/ui/legacy/src/main/res/values-iw/strings.xml @@ -538,10 +538,6 @@ תצוגה מקדימה הודעות שולח - ל - עותק - עותק מוסתר - כותרות נוספות כותרת שעה ותאריך גוף ההודעה diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml index 6d814e65e..9d9cd5277 100644 --- a/app/ui/legacy/src/main/res/values-ja/strings.xml +++ b/app/ui/legacy/src/main/res/values-ja/strings.xml @@ -728,10 +728,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ プレビュー メッセージ表示 送信者 - To - CC - Bcc - 追加ヘッダ 件名 日時 本文 diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml index e2e0f709e..05269ca21 100644 --- a/app/ui/legacy/src/main/res/values-ko/strings.xml +++ b/app/ui/legacy/src/main/res/values-ko/strings.xml @@ -579,10 +579,6 @@ 미리 보기 메시지 보낸이 - 받는이 - 참조 - 숨은 참조 - 추가 헤더 정보 제목 시간 및 날짜 내용 diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml index ca9b1384d..99c71c547 100644 --- a/app/ui/legacy/src/main/res/values-lt/strings.xml +++ b/app/ui/legacy/src/main/res/values-lt/strings.xml @@ -722,10 +722,6 @@ Pateikite pranešimus apie klaidas, prisidėkite prie naujų funkcijų kūrimo i Peržiūra Laiškai Siuntėjas - Kam - Cc - Slapta kopija - Papildomos antraštės Tema Laikas ir data Pagrindinė laiško dalis diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml index ccd311247..c5cb9e909 100644 --- a/app/ui/legacy/src/main/res/values-lv/strings.xml +++ b/app/ui/legacy/src/main/res/values-lv/strings.xml @@ -690,10 +690,6 @@ pat %d vairāk Priekšskatījums Vēstules Sūtītājs - Kam - Cc - Neredzamais - Izvērsta vēstules papildinformācija Temats Laiks un datums Vēstules pamatteksts diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml index bfd398211..020564612 100644 --- a/app/ui/legacy/src/main/res/values-ml/strings.xml +++ b/app/ui/legacy/src/main/res/values-ml/strings.xml @@ -691,10 +691,6 @@ പ്രിവ്യൂ സന്ദേശങ്ങൾ അയച്ചയാൾ - To - Cc - Bcc - അധിക തലക്കെട്ടുകൾ വിഷയം സമയവും തീയതിയും സന്ദേശ ബോഡി diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml index d2a64cd6b..a0ed2e0ac 100644 --- a/app/ui/legacy/src/main/res/values-nb/strings.xml +++ b/app/ui/legacy/src/main/res/values-nb/strings.xml @@ -662,10 +662,6 @@ til %d flere Forhåndsvisning Meldinger Avsender - Til - Kopi - Blindkopi - Flere meldingshoder Emne Tid og dato Meldingstekst diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml index 0d49caafb..c1b9c930a 100644 --- a/app/ui/legacy/src/main/res/values-nl/strings.xml +++ b/app/ui/legacy/src/main/res/values-nl/strings.xml @@ -725,10 +725,6 @@ Graag foutrapporten sturen, bijdragen voor nieuwe functies en vragen stellen op Voorbeeld Berichten Afzender - Bericht ontvanger (Aan) - Bericht ontvanger (CC) - Bericht ontvanger (BCC) - Extra koppen Onderwerp Tijd en datum Berichtinhoud diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml index 6dfcd3bf7..c53c86e1d 100644 --- a/app/ui/legacy/src/main/res/values-pl/strings.xml +++ b/app/ui/legacy/src/main/res/values-pl/strings.xml @@ -734,10 +734,6 @@ Wysłane z urządzenia Android za pomocą K-9 Mail. Proszę wybaczyć moją zwi Podgląd Wiadomości Nadawca - Adresat (Do:) - Odbiorca kopii (DW:) - UDW - Dodatkowe nagłówki Temat Czas i data Treść wiadomości diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml index bb1ab6a5c..f4c7c76fd 100644 --- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml +++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml @@ -731,10 +731,6 @@ Por favor encaminhe relatórios de bugs, contribua com novos recursos e tire dú Visualização Mensagens Remetente - Para - Cc - Cco - Cabeçalhos adicionais Assunto Data e hora Corpo da mensagem diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml index 0ea4b36c0..78eacc04b 100644 --- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml +++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml @@ -718,10 +718,6 @@ Por favor envie relatórios de falhas, contribua com novas funcionalidades e col Pré-visualização Mensagens Remetente - Para - Cc - Bcc - Cabeçalhos adicionais Assunto Data e hora Corpo da mensagem diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml index 1ead48d20..ef0286ef0 100644 --- a/app/ui/legacy/src/main/res/values-ro/strings.xml +++ b/app/ui/legacy/src/main/res/values-ro/strings.xml @@ -728,10 +728,6 @@ Uneori datorită faptului că cineva încearcă să te atace pe tine sau serveru Previzualizare Mesaje Expeditor - Către - Cc - Bcc - Antete adiționale Subiect Timp și dată Conținut mesaj diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml index bcade6a6c..de5870c6e 100644 --- a/app/ui/legacy/src/main/res/values-ru/strings.xml +++ b/app/ui/legacy/src/main/res/values-ru/strings.xml @@ -733,10 +733,6 @@ K-9 Mail — почтовый клиент для Android. Просмотр Сообщение Отправитель - Кому - Копия - Скрытая - Все заголовки Тема Дата и время Тело сообщения diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml index 8eb5d1d2e..e733d27a8 100644 --- a/app/ui/legacy/src/main/res/values-sk/strings.xml +++ b/app/ui/legacy/src/main/res/values-sk/strings.xml @@ -669,10 +669,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte Náhľad Správy Odosielateľ - Komu - Kópia - Skrytá kópia - Prídavné hlavičky Skrytá kópia Čas a dátum Telo správy diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml index 782ec5496..179219807 100644 --- a/app/ui/legacy/src/main/res/values-sl/strings.xml +++ b/app/ui/legacy/src/main/res/values-sl/strings.xml @@ -727,10 +727,6 @@ dodatnih %d sporočil Predogled Sporočila Pošiljatelj - Za - Kp - Skp - Dodatni zapisi glave Zadeva Čas in datum Telo sporočila diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml index 71843b095..048afc934 100644 --- a/app/ui/legacy/src/main/res/values-sq/strings.xml +++ b/app/ui/legacy/src/main/res/values-sq/strings.xml @@ -729,10 +729,6 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj Paraparje Mesazhe Dërgues - Për - Cc - Bcc - Krye shtesë Subjekt Kohë dhe datë Trup i mesazhit diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml index 01a1f7faa..09195b457 100644 --- a/app/ui/legacy/src/main/res/values-sr/strings.xml +++ b/app/ui/legacy/src/main/res/values-sr/strings.xml @@ -667,10 +667,6 @@ Преглед Поруке Пошиљалац - За - Коп - СКоп - Додатна заглавља Тема Време и датум Тело поруке diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml index 03eb42d3d..814e08a97 100644 --- a/app/ui/legacy/src/main/res/values-sv/strings.xml +++ b/app/ui/legacy/src/main/res/values-sv/strings.xml @@ -730,10 +730,6 @@ Skicka in felrapporter, bidra med nya funktioner och ställ frågor på Förhandsgranskning Meddelanden Avsändare - Till - Kopia - Blindkopia - Ytterligare meddelanderubriker Ämne Tid och datum Innehåll diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml index ffe13fecd..b3407491a 100644 --- a/app/ui/legacy/src/main/res/values-tr/strings.xml +++ b/app/ui/legacy/src/main/res/values-tr/strings.xml @@ -705,10 +705,6 @@ Microsoft Exchange ile konuşurken bazı tuhaflıklar yaşadığını not ediniz Önizleme Mesajlar Gönderen - Kime - Bilgi - Gizli Kopya - Ek başlıklar Konu Saat ve Tarih Mesaj gövdesi diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml index 58f3149f8..bb0ea4692 100644 --- a/app/ui/legacy/src/main/res/values-uk/strings.xml +++ b/app/ui/legacy/src/main/res/values-uk/strings.xml @@ -728,10 +728,6 @@ K-9 Mail — це вільний клієнт електронної пошти Попередній перегляд Повідомлення Відправник - Кому - Копія - Прихована копія - Додаткові заголовки Тема Час і дата Тіло повідомлення diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml index 42b68edb1..62db4aa00 100644 --- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml +++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml @@ -728,10 +728,6 @@ K-9 Mail 是 Android 上一款功能强大的免费邮件客户端。 预览 邮件 发件人 - 收件人 - 抄送 - 秘送 - 额外的邮件信息 主题 日期 邮件内容 diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml index 26f5db4e7..ac111b2ac 100644 --- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml +++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml @@ -721,10 +721,6 @@ K-9 Mail 是 Android 上一款功能強大，免費的電子郵件用戶端。 預覽 郵件 寄件人 - 收件人 - 副本 - 密件副本 - 額外的郵件訊息 主題 日期 郵件本文內容 diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml index ecc655b2f..eba18a889 100644 --- a/app/ui/legacy/src/main/res/values/strings.xml +++ b/app/ui/legacy/src/main/res/values/strings.xml @@ -876,10 +876,7 @@ Please submit bug reports, contribute new features and ask questions at Messages Sender - To - Cc - Bcc - Additional headers + Recipients Subject Time and date Message body diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml index ebc9be2bd..13e01248f 100644 --- a/app/ui/legacy/src/main/res/xml/general_settings.xml +++ b/app/ui/legacy/src/main/res/xml/general_settings.xml @@ -148,38 +148,6 @@ android:title="@string/font_size_message_view" android:key="message_view_fonts"> - - - - - - - - + + + android:dialogTitle="@string/font_size_message_view_recipients" />