diff --git a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift index e166c8f74..b546db3e2 100644 --- a/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift +++ b/Mail/Views/Bottom sheets/Actions/ActionsPanelViewModifier.swift @@ -62,7 +62,7 @@ struct ActionsPanelViewModifier: ViewModifier { originFolder: originFolder?.freezeIfNeeded(), nearestFlushAlert: $flushAlert, nearestMessagesToMoveSheet: $messagesToMove, - nearestBlockSender: $blockSenderAlert, + nearestBlockSenderAlert: $blockSenderAlert, nearestBlockSendersList: $blockSendersList, nearestReportJunkMessageActionsPanel: $reportForJunkMessages, nearestReportedForPhishingMessageAlert: $reportedForPhishingMessage, @@ -89,7 +89,7 @@ struct ActionsPanelViewModifier: ViewModifier { } .floatingPanel(item: $blockSendersList, title: MailResourcesStrings.Localizable.blockAnExpeditorTitle) { blockSenderState in - BlockSenderView(recipientsToMessage: blockSenderState.blocklist, origin: origin) + BlockSenderView(recipientsToMessage: blockSenderState.recipientsToMessage, origin: origin) } .customAlert(item: $blockSenderAlert) { blockSenderState in ConfirmationBlockRecipientView( diff --git a/MailResources/Localizable/de.lproj/Localizable.strings b/MailResources/Localizable/de.lproj/Localizable.strings index 41fa261e4..2f770baf0 100644 --- a/MailResources/Localizable/de.lproj/Localizable.strings +++ b/MailResources/Localizable/de.lproj/Localizable.strings @@ -3,8 +3,8 @@ * Project: kMail * Locale: de, German * Tagged: ios - * Exported by: elena willen - * Exported at: Wed, 04 Sep 2024 11:22:24 +0200 + * Exported by: Matthieu Déglon + * Exported at: Wed, 11 Sep 2024 15:20:23 +0200 */ /* loco:62bb154d7513e127cb2e9c94 */ @@ -340,6 +340,9 @@ /* loco:651ebd40ccc14ebdca0313a5 */ "buttonBackToApp" = "Zurück zur Anwendung Mail"; +/* loco:66db0113e0da22884c09f724 */ +"buttonBlockAnExpeditor" = "Block"; + /* loco:62b2d43771635f1d1f0da462 */ "buttonBold" = "Kühn"; @@ -353,7 +356,7 @@ "buttonCancel" = "Abbrechen"; /* loco:62befe9ca822415272753592 */ -"buttonClose" = "Schliessen Sie"; +"buttonClose" = "Schliessen"; /* loco:63e391b028b5fa7bab41e292 */ "buttonConfirm" = "Bestätigen"; @@ -415,9 +418,6 @@ /* loco:6425777e2343387912223aa2 */ "buttonLater" = "Später"; -/* loco:665868ebce4392ec5d0e94f2 */ -"buttonLink" = "Einen Hyperlink hinzufügen"; - /* loco:645b485e158c37a429012092 */ "buttonLoadMore" = "Mehr Unterhaltungen laden"; diff --git a/MailResources/Localizable/en.lproj/Localizable.strings b/MailResources/Localizable/en.lproj/Localizable.strings index 4961a3dfd..62a7d2017 100644 --- a/MailResources/Localizable/en.lproj/Localizable.strings +++ b/MailResources/Localizable/en.lproj/Localizable.strings @@ -3,8 +3,8 @@ * Project: kMail * Locale: en, English * Tagged: ios - * Exported by: elena willen - * Exported at: Wed, 04 Sep 2024 11:22:24 +0200 + * Exported by: Matthieu Déglon + * Exported at: Wed, 11 Sep 2024 15:20:23 +0200 */ /* loco:62bb154d7513e127cb2e9c94 */ @@ -418,9 +418,6 @@ /* loco:6425777e2343387912223aa2 */ "buttonLater" = "Later"; -/* loco:665868ebce4392ec5d0e94f2 */ -"buttonLink" = "Add a hyperlink"; - /* loco:645b485e158c37a429012092 */ "buttonLoadMore" = "Load more conversations"; @@ -548,7 +545,7 @@ "confirmLogoutTitle" = "Log out"; /* loco:66db00746332bbedae01f2f2 */ -"confirmationToBlockAnExpeditorText" = "This e-mail and all future messages from %s will be moved to the Junk Mail folder."; +"confirmationToBlockAnExpeditorText" = "This email and all future messages from %s will be moved to the Junk Mail folder."; /* loco:62737dea7bd28e302301e5c2 */ "contactActionAddToContacts" = "Add to contacts"; diff --git a/MailResources/Localizable/es.lproj/Localizable.strings b/MailResources/Localizable/es.lproj/Localizable.strings index 4fdd1f5f6..16128607f 100644 --- a/MailResources/Localizable/es.lproj/Localizable.strings +++ b/MailResources/Localizable/es.lproj/Localizable.strings @@ -3,8 +3,8 @@ * Project: kMail * Locale: es, Spanish * Tagged: ios - * Exported by: elena willen - * Exported at: Wed, 04 Sep 2024 11:22:24 +0200 + * Exported by: Matthieu Déglon + * Exported at: Wed, 11 Sep 2024 15:20:23 +0200 */ /* loco:62bb154d7513e127cb2e9c94 */ @@ -283,6 +283,12 @@ /* loco:6266649755d41301973d0c43 */ "bccTitle" = "CCO:"; +/* loco:669a5cc96c0dbf9fe909b662 */ +"blockAnExpeditorTitle" = "Bloquear un remitente"; + +/* loco:66dee0ef5c6d656046044445 */ +"blockExpeditorTitle" = "Bloquear %s"; + /* loco:649ea00ef9c6ecfe620a0b62 */ "blockedPasswordTitle" = "Contraseña bloqueada"; @@ -334,6 +340,9 @@ /* loco:651ebd40ccc14ebdca0313a5 */ "buttonBackToApp" = "Volver a la aplicación Mail"; +/* loco:66db0113e0da22884c09f724 */ +"buttonBlockAnExpeditor" = "Bloque"; + /* loco:62b2d43771635f1d1f0da462 */ "buttonBold" = "Negrita"; @@ -409,9 +418,6 @@ /* loco:6425777e2343387912223aa2 */ "buttonLater" = "Más tarde"; -/* loco:665868ebce4392ec5d0e94f2 */ -"buttonLink" = "Añadir un hipervínculo"; - /* loco:645b485e158c37a429012092 */ "buttonLoadMore" = "Cargar más conversaciones"; @@ -538,6 +544,9 @@ /* loco:63a473bcf3bb7f422358cfd2 */ "confirmLogoutTitle" = "Cerrar sesión"; +/* loco:66db00746332bbedae01f2f2 */ +"confirmationToBlockAnExpeditorText" = "Este correo electrónico y todos los futuros mensajes de %s se moverán a la carpeta de correo no deseado."; + /* loco:62737dea7bd28e302301e5c2 */ "contactActionAddToContacts" = "Añadir a contactos"; diff --git a/MailResources/Localizable/fr.lproj/Localizable.strings b/MailResources/Localizable/fr.lproj/Localizable.strings index 52b640e14..865ffc5fc 100644 --- a/MailResources/Localizable/fr.lproj/Localizable.strings +++ b/MailResources/Localizable/fr.lproj/Localizable.strings @@ -3,8 +3,8 @@ * Project: kMail * Locale: fr, French * Tagged: ios - * Exported by: elena willen - * Exported at: Wed, 04 Sep 2024 11:22:24 +0200 + * Exported by: Matthieu Déglon + * Exported at: Wed, 11 Sep 2024 15:20:23 +0200 */ /* loco:62bb154d7513e127cb2e9c94 */ @@ -283,6 +283,12 @@ /* loco:6266649755d41301973d0c43 */ "bccTitle" = "Cci :"; +/* loco:669a5cc96c0dbf9fe909b662 */ +"blockAnExpeditorTitle" = "Bloquer un expéditeur"; + +/* loco:66dee0ef5c6d656046044445 */ +"blockExpeditorTitle" = "Bloquer %s"; + /* loco:649ea00ef9c6ecfe620a0b62 */ "blockedPasswordTitle" = "Mot de passe bloqué"; @@ -334,6 +340,9 @@ /* loco:651ebd40ccc14ebdca0313a5 */ "buttonBackToApp" = "Retour à l’application Mail"; +/* loco:66db0113e0da22884c09f724 */ +"buttonBlockAnExpeditor" = "Bloquer"; + /* loco:62b2d43771635f1d1f0da462 */ "buttonBold" = "Gras"; @@ -409,9 +418,6 @@ /* loco:6425777e2343387912223aa2 */ "buttonLater" = "Plus tard"; -/* loco:665868ebce4392ec5d0e94f2 */ -"buttonLink" = "Ajouter un lien hypertexte"; - /* loco:645b485e158c37a429012092 */ "buttonLoadMore" = "Charger plus de conversations"; @@ -538,6 +544,9 @@ /* loco:63a473bcf3bb7f422358cfd2 */ "confirmLogoutTitle" = "Me déconnecter"; +/* loco:66db00746332bbedae01f2f2 */ +"confirmationToBlockAnExpeditorText" = "Cet e-mail et tous les futurs messages de %s seront déplacés dans le dossier Courrier indésirable."; + /* loco:62737dea7bd28e302301e5c2 */ "contactActionAddToContacts" = "Ajouter aux contacts"; diff --git a/MailResources/Localizable/it.lproj/Localizable.strings b/MailResources/Localizable/it.lproj/Localizable.strings index 06ee2ac91..711474f1a 100644 --- a/MailResources/Localizable/it.lproj/Localizable.strings +++ b/MailResources/Localizable/it.lproj/Localizable.strings @@ -3,8 +3,8 @@ * Project: kMail * Locale: it, Italian * Tagged: ios - * Exported by: elena willen - * Exported at: Wed, 04 Sep 2024 11:22:24 +0200 + * Exported by: Matthieu Déglon + * Exported at: Wed, 11 Sep 2024 15:20:23 +0200 */ /* loco:62bb154d7513e127cb2e9c94 */ @@ -283,6 +283,12 @@ /* loco:6266649755d41301973d0c43 */ "bccTitle" = "Bcc:"; +/* loco:669a5cc96c0dbf9fe909b662 */ +"blockAnExpeditorTitle" = "Blocca un mittente"; + +/* loco:66dee0ef5c6d656046044445 */ +"blockExpeditorTitle" = "Blocca %s"; + /* loco:649ea00ef9c6ecfe620a0b62 */ "blockedPasswordTitle" = "Password bloccata"; @@ -334,6 +340,9 @@ /* loco:651ebd40ccc14ebdca0313a5 */ "buttonBackToApp" = "Torna all’applicazione Mail"; +/* loco:66db0113e0da22884c09f724 */ +"buttonBlockAnExpeditor" = "Blocca"; + /* loco:62b2d43771635f1d1f0da462 */ "buttonBold" = "In grassetto"; @@ -409,9 +418,6 @@ /* loco:6425777e2343387912223aa2 */ "buttonLater" = "Più tardi"; -/* loco:665868ebce4392ec5d0e94f2 */ -"buttonLink" = "Aggiungere un collegamento ipertestuale"; - /* loco:645b485e158c37a429012092 */ "buttonLoadMore" = "Carica altre conversazioni"; @@ -538,6 +544,9 @@ /* loco:63a473bcf3bb7f422358cfd2 */ "confirmLogoutTitle" = "Disconnettersi"; +/* loco:66db00746332bbedae01f2f2 */ +"confirmationToBlockAnExpeditorText" = "Questa e-mail e tutti i futuri messaggi di %s saranno spostati nella cartella della posta indesiderata."; + /* loco:62737dea7bd28e302301e5c2 */ "contactActionAddToContacts" = "Aggiungi ai contatti";