Show number of messages reported as spam, fixed double confirm

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

@@ -1481,7 +1481,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private void onMenuJunk(final ActionData data) {
             new DialogBuilderLifecycle(context, owner)
-                    .setMessage(R.string.title_ask_spam)
+                    .setMessage(context.getResources().getQuantityString(R.plurals.title_ask_spam, 1, 1))
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {

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

@@ -1187,8 +1187,9 @@ public class FragmentMessages extends FragmentBase {
     }
 
     private void onActionJunkSelection() {
+        int count = selectionTracker.getSelection().size();
         new DialogBuilderLifecycle(getContext(), getViewLifecycleOwner())
-                .setMessage(R.string.title_ask_spam)
+                .setMessage(getResources().getQuantityString(R.plurals.title_ask_spam, count, count))
                 .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -1199,7 +1200,7 @@ public class FragmentMessages extends FragmentBase {
                 .show();
     }
 
-    private void onActionMoveSelection(String type) {
+    private void onActionMoveSelection(final String type) {
         Bundle args = new Bundle();
         args.putString("type", type);
         args.putLongArray("ids", getSelection());
@@ -1241,7 +1242,10 @@ public class FragmentMessages extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, ArrayList<MessageTarget> result) {
-                moveAsk(result);
+                if (EntityFolder.JUNK.equals(type))
+                    moveAskConfirmed(result);
+                else
+                    moveAsk(result);
             }
 
             @Override

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

@@ -202,7 +202,6 @@
     <string name="title_attachment_saved">حفظ المرفقات</string>
     <string name="title_ask_delete">هل تريد حذف الرسالة بشكل دائم؟</string>
     <string name="title_ask_discard">إلغاء المسودة؟</string>
-    <string name="title_ask_spam">الإبلاغ عنه كبريد مزعج؟</string>
     <string name="title_fix">تصليح</string>
     <string name="title_compose">تحرير</string>
     <string name="title_from">من:</string>

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

@@ -202,7 +202,6 @@
     <string name="title_attachment_saved">حفظ المرفقات</string>
     <string name="title_ask_delete">هل تريد حذف الرسالة بشكل دائم؟</string>
     <string name="title_ask_discard">إلغاء المسودة؟</string>
-    <string name="title_ask_spam">الإبلاغ عنه كبريد مزعج؟</string>
     <string name="title_fix">تصليح</string>
     <string name="title_compose">تحرير</string>
     <string name="title_from">من:</string>

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

@@ -202,7 +202,6 @@
     <string name="title_attachment_saved">حفظ المرفقات</string>
     <string name="title_ask_delete">هل تريد حذف الرسالة بشكل دائم؟</string>
     <string name="title_ask_discard">إلغاء المسودة؟</string>
-    <string name="title_ask_spam">الإبلاغ عنه كبريد مزعج؟</string>
     <string name="title_fix">تصليح</string>
     <string name="title_compose">تحرير</string>
     <string name="title_from">من:</string>

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

@@ -202,7 +202,6 @@
     <string name="title_attachment_saved">حفظ المرفقات</string>
     <string name="title_ask_delete">هل تريد حذف الرسالة بشكل دائم؟</string>
     <string name="title_ask_discard">إلغاء المسودة؟</string>
-    <string name="title_ask_spam">الإبلاغ عنه كبريد مزعج؟</string>
     <string name="title_fix">تصليح</string>
     <string name="title_compose">تحرير</string>
     <string name="title_from">من:</string>

app/src/main/res/values-az-rAZ/strings.xml

@@ -95,10 +95,10 @@
     <string name="title_advanced_avatars">Şəxs fotolarını göstər</string>
     <string name="title_advanced_identicons">İdentikon-ları göstər</string>
     <string name="title_advanced_preview">Mesaj ilkin baxışını göstər</string>
+    <string name="title_advanced_actionbar">Söhbət hərəkət sətri</string>
     <string name="title_advanced_light">Bildiriş işığından istifadə et</string>
     <string name="title_advanced_sound">Bildiriş səsi seç</string>
     <string name="title_advanced_pull_refresh">Təzələmək üçün aşağı çəkin</string>
-    <string name="title_advanced_actionbar">Söhbət hərəkət sətri</string>
     <string name="title_advanced_autoclose">Söhbətləri avtomatik bağla</string>
     <string name="title_advanced_autoread">Hərəkətli mesajlarda oxunan mesajları avtomatik işarələ</string>
     <string name="title_advanced_collapse">\'Geri\' mövzusundakı danışıqda mesajları daralt</string>
@@ -235,7 +235,6 @@
     <string name="title_ask_delete_selected">Seçilmiş mesajlar birdəfəlik silinsin?</string>
     <string name="title_ask_delete_answer">Cavab şablonu birdəfəlik silinsin?</string>
     <string name="title_ask_discard">Qaralama silinsin?</string>
-    <string name="title_ask_spam">Spam kimi bildirilsin?</string>
     <string name="title_ask_show_html">Orijinal mesajın göstərilməsi, gizlilik həssaslı məlumatları sızdıra bilər</string>
     <string name="title_ask_show_image">Təsvirlərin göstərilməsi, gizlilik həssaslı məlumatların sızdıra bilər</string>
     <string name="title_sync_queued">Eyniləşdirmə növbəti hesab bağlantısında həyata keçiriləcək</string>

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

@@ -140,7 +140,6 @@
     <string name="title_attachment_saved">Vedhæftet fil gemt</string>
     <string name="title_ask_delete">Slet meddelelsen permanent?</string>
     <string name="title_ask_discard">Kassér udkast?</string>
-    <string name="title_ask_spam">Rapporter som spam?</string>
     <string name="title_fix">Ret</string>
     <string name="title_from">Fra:</string>
     <string name="title_to">Til:</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Identicons als Kontaktbilder anzeigen</string>
     <string name="title_advanced_preview">Nachrichtenvorschau anzeigen</string>
     <string name="title_advanced_addresses">Adressdetails standardmäßig anzeigen</string>
+    <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
     <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
     <string name="title_advanced_sound">Benachrichtigungston auswählen</string>
     <string name="title_advanced_pull_refresh">Zum Aktualisieren nach unten ziehen</string>
-    <string name="title_advanced_actionbar">Navigationsleiste in Konversationen</string>
     <string name="title_advanced_autoclose">Konversationen automatisch schließen</string>
     <string name="title_advanced_autonext">Automatisch beim Schließen einer Konversation zur nächsten Konversation wechseln</string>
     <string name="title_advanced_autoread">Nachrichten beim Verschieben automatisch als gelesen markieren</string>
@@ -275,7 +275,6 @@
     <string name="title_ask_delete_answer">Antwortvorlage unwiderruflich löschen?</string>
     <string name="title_ask_delete_rule">Regel unwiderruflich löschen?</string>
     <string name="title_ask_discard">Entwurf löschen?</string>
-    <string name="title_ask_spam">Als Spam melden?</string>
     <string name="title_ask_show_html">Das Anzeigen der originalen Nachricht kann datenschutzrelevante Informationen preisgeben</string>
     <string name="title_ask_show_image">Das Anzeigen von Bildern kann datenschutzrelevante Informationen preisgeben</string>
     <string name="title_sync_queued">Synchronisierung wird bei der nächsten Kontoverbindung ausgeführt</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Mostrar identicons</string>
     <string name="title_advanced_preview">Mostrar vista previa de mensajes</string>
     <string name="title_advanced_addresses">Mostrar detalles de dirección por defecto</string>
+    <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
     <string name="title_advanced_light">Usar luz de notificación</string>
     <string name="title_advanced_sound">Seleccionar sonido de notificación</string>
     <string name="title_advanced_pull_refresh">Tire hacia abajo para actualizar</string>
-    <string name="title_advanced_actionbar">Barra de acciones de conversación</string>
     <string name="title_advanced_autoclose">Cerrar conversaciones automáticamente</string>
     <string name="title_advanced_autonext">Al cerrar una conversación, ir automáticamente a la siguiente</string>
     <string name="title_advanced_autoread">Marcar mensaje como leído automáticamente al moverlo</string>
@@ -275,7 +275,6 @@
     <string name="title_ask_delete_answer">¿Eliminar plantilla de respuesta permanentemente?</string>
     <string name="title_ask_delete_rule">¿Eliminar regla permanentemente?</string>
     <string name="title_ask_discard">¿Descartar el borrador?</string>
-    <string name="title_ask_spam">¿Reportar como spam?</string>
     <string name="title_ask_show_html">Mostrar el mensaje original puede filtrar información privada sensible</string>
     <string name="title_ask_show_image">Mostrar imágenes puede filtrar información privada sensible</string>
     <string name="title_sync_queued">La sincronización se realizará en la próxima conexión de la cuenta</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Afficher les identicônes</string>
     <string name="title_advanced_preview">Afficher l\'aperçu du message</string>
     <string name="title_advanced_addresses">Afficher par défaut les détails de l\'adresse</string>
+    <string name="title_advanced_actionbar">Barre d\'action de conversation</string>
     <string name="title_advanced_light">Utiliser le voyant de notification</string>
     <string name="title_advanced_sound">Sélectionner le son pour les notifications</string>
     <string name="title_advanced_pull_refresh">Tirer vers le bas pour actualiser</string>
-    <string name="title_advanced_actionbar">Barre d\'action de conversation</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
     <string name="title_advanced_autonext">Lors de la fermeture d\'une conversation, aller automatiquement sur la suivante</string>
     <string name="title_advanced_autoread">Marquer automatiquement le message comme lu lors de son déplacement</string>
@@ -275,7 +275,6 @@
     <string name="title_ask_delete_answer">Supprimer définitivement le modèle de réponse ?</string>
     <string name="title_ask_delete_rule">Supprimer définitivement la règle ?</string>
     <string name="title_ask_discard">Supprimer le brouillon ?</string>
-    <string name="title_ask_spam">Signaler comme spam ?</string>
     <string name="title_ask_show_html">Afficher le message original peut divulguer des informations sensibles privées</string>
     <string name="title_ask_show_image">Afficher les images peut divulguer des informations sensibles privées</string>
     <string name="title_sync_queued">La synchronisation sera effectuée à la prochaine connexion d\'un compte</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Visualizza identicon</string>
     <string name="title_advanced_preview">Mostra l\'anteprima del messaggio</string>
     <string name="title_advanced_addresses">Mostra i dettagli dell\'indirizzo per impostazione predefinita</string>
+    <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
     <string name="title_advanced_light">Usa il led di notifica</string>
     <string name="title_advanced_sound">Seleziona il suono di notifica</string>
     <string name="title_advanced_pull_refresh">Trascina in basso per aggiornare</string>
-    <string name="title_advanced_actionbar">Barra di azione di conversazione</string>
     <string name="title_advanced_autoclose">Chiudi automaticamente le conversazioni</string>
     <string name="title_advanced_autonext">Passa automaticamente alla conversazione successiva nella conversazione stretta</string>
     <string name="title_advanced_autoread">Contrassegna automaticamente il messaggio come letto sul messaggio in movimento</string>
@@ -275,7 +275,6 @@
     <string name="title_ask_delete_answer">Elimina definitivamente il modello di risposta?</string>
     <string name="title_ask_delete_rule">Eliminare la regola permanentemente?</string>
     <string name="title_ask_discard">Eliminare la bozza?</string>
-    <string name="title_ask_spam">Segnalare come spam?</string>
     <string name="title_ask_show_html">Mostrare il messaggio originale rende possibile una fuga di informazioni personali sensibili</string>
     <string name="title_ask_show_image">Mostrare le immagini rende possibile una fuga di informazioni personali sensibili</string>
     <string name="title_sync_queued">La sincronizzazione avverrà alla connessione del prossimo account</string>
@@ -308,6 +307,7 @@
     <string name="title_attachments_missing">Non tutti gli allegati sono stati scaricati</string>
     <string name="title_draft_deleted">Bozza eliminata</string>
     <string name="title_draft_saved">Bozza salvata</string>
+    <string name="title_ask_send_via">Inviare messaggio a %1$s tramite %2$s?</string>
     <string name="title_queued">Invio messaggio in corso</string>
     <string name="title_encrypt">Crittografare</string>
     <string name="title_decrypt">Decifra</string>

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

@@ -34,6 +34,10 @@
         <item quantity="one">Één bericht verplaatsen naar %2$s ?</item>
         <item quantity="other">%1$d berichten verplaatsen naar %2$s?</item>
     </plurals>
+    <plurals name="title_ask_spam">
+        <item quantity="one">Rapporteer één bericht als spam?</item>
+        <item quantity="other">Rapporteer %1$d berichten als spam?</item>
+    </plurals>
     <string name="title_notification_failed">\'%1$s\' is mislukt</string>
     <string name="menu_setup">Instellingen</string>
     <string name="menu_answers">Sjablonen</string>
@@ -112,10 +116,10 @@
     <string name="title_advanced_identicons">Toon identicons</string>
     <string name="title_advanced_preview">Bericht voorvertoning</string>
     <string name="title_advanced_addresses">Adresgegevens standaard weergeven</string>
+    <string name="title_advanced_actionbar">Actiebalk gesprek</string>
     <string name="title_advanced_light">Gebruik meldingslicht</string>
     <string name="title_advanced_sound">Selecteer meldingsgeluid</string>
     <string name="title_advanced_pull_refresh">Omlaag schuiven om te verversen</string>
-    <string name="title_advanced_actionbar">Actiebalk gesprek</string>
     <string name="title_advanced_autoclose">Gesprekken automatisch sluiten</string>
     <string name="title_advanced_autonext">Automatisch naar het volgende gesprek gaan bij het sluiten van een gesprek</string>
     <string name="title_advanced_autoread">Markeer berichten automatisch als gelezen bij het verplaatsen van berichten</string>
@@ -275,7 +279,6 @@
     <string name="title_ask_delete_answer">Verwijder antwoordsjabloon permanent?</string>
     <string name="title_ask_delete_rule">Verwijder regel permanent?</string>
     <string name="title_ask_discard">Concept weggooien?</string>
-    <string name="title_ask_spam">Als spam melden?</string>
     <string name="title_ask_show_html">Het originele bericht tonen kan privacy gevoelige informatie lekken</string>
     <string name="title_ask_show_image">Afbeeldingen tonen kan privacy gevoelige informatie lekken</string>
     <string name="title_sync_queued">Synchronisatie zal plaatsvinden bij de volgende accountverbinding</string>

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

@@ -235,7 +235,6 @@
     <string name="title_ask_delete_selected">Trwale usunąć wybrane wiadomości?</string>
     <string name="title_ask_delete_answer">Trwale usunąć szablon odpowiedzi?</string>
     <string name="title_ask_discard">Odrzucić szkic?</string>
-    <string name="title_ask_spam">Zgłosić jako spam?</string>
     <string name="title_ask_show_html">Pokazywanie oryginalnej wiadomości może spowodować wyciek wrażliwych informacji</string>
     <string name="title_ask_show_image">Pokazywanie obrazów może spowodować wyciek wrażliwych informacji</string>
     <string name="title_sync_queued">Synchronizacja nastąpi podczas następnego połączenia z kontem</string>

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

@@ -166,7 +166,6 @@
     <string name="title_no_internet">Sem conexão com a internet</string>
     <string name="title_attachment_saved">Anexo salvo</string>
     <string name="title_ask_delete">Deletar mensagem permanentemente?</string>
-    <string name="title_ask_spam">Reportar como spam?</string>
     <string name="title_compose">Escrever</string>
     <string name="title_from">De:</string>
     <string name="title_to">Para:</string>

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

@@ -118,10 +118,10 @@
     <string name="title_advanced_identicons">Arată iconițe generate</string>
     <string name="title_advanced_preview">Arată previzualizare mesaj</string>
     <string name="title_advanced_addresses">Implicit arată detaliile adreselor</string>
+    <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
     <string name="title_advanced_light">Folosire LED de notificare</string>
     <string name="title_advanced_sound">Selectare sunet de notificare</string>
     <string name="title_advanced_pull_refresh">Trageți în jos pentru a actualiza</string>
-    <string name="title_advanced_actionbar">Bara de acțiuni corversație</string>
     <string name="title_advanced_autoclose">Închide automat conversațiile</string>
     <string name="title_advanced_autonext">Se trece la următoarea conversație când este închisă cea curentă</string>
     <string name="title_advanced_autoread">Marchează automat mesajele mutate ca citite</string>
@@ -281,7 +281,6 @@
     <string name="title_ask_delete_answer">Se șterge permanent șablonul de răspuns?</string>
     <string name="title_ask_delete_rule">Ștergeți regula definitiv?</string>
     <string name="title_ask_discard">Renunțați la ciornă?</string>
-    <string name="title_ask_spam">Raportează ca spam?</string>
     <string name="title_ask_show_html">Vizualizarea mesajului original poate duce la divulgarea de informații confidențiale</string>
     <string name="title_ask_show_image">Vizualizarea imaginilor poate duce la divulgarea de informații confidențiale</string>
     <string name="title_sync_queued">Sincronizarea va avea loc la următoarea conexiune a contului</string>

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

@@ -124,10 +124,10 @@
     <string name="title_advanced_identicons">Показать идентификаторы</string>
     <string name="title_advanced_preview">Показать предварительный просмотр сообщения</string>
     <string name="title_advanced_addresses">Показывать подробную информацию об адресах по умолчанию</string>
+    <string name="title_advanced_actionbar">Панель управления диалогами</string>
     <string name="title_advanced_light">Использовать индикатор уведомлений</string>
     <string name="title_advanced_sound">Выбрать звук уведомления</string>
     <string name="title_advanced_pull_refresh">Потяните вниз, для обновления</string>
-    <string name="title_advanced_actionbar">Панель управления диалогами</string>
     <string name="title_advanced_autoclose">Автоматически закрывать диалоги</string>
     <string name="title_advanced_autonext">При закрытии диалога, автоматически открыть следующий</string>
     <string name="title_advanced_autoread">Автоматически помечать сообщения прочитанными при перемещении</string>
@@ -287,7 +287,6 @@
     <string name="title_ask_delete_answer">Удалить шаблон ответа навсегда?</string>
     <string name="title_ask_delete_rule">Удалить правило навсегда?</string>
     <string name="title_ask_discard">Удалить черновик?</string>
-    <string name="title_ask_spam">Сообщать о спаме?</string>
     <string name="title_ask_show_html">Отображение исходного сообщения может привести к утечке конфиденциальной информации</string>
     <string name="title_ask_show_image">Отображение изображений может привести к утечке конфиденциальной информации</string>
     <string name="title_sync_queued">Будет синхронизировано при следующем подключении к учетной записи</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Visa identicons</string>
     <string name="title_advanced_preview">Förhandsvisning av meddelande</string>
     <string name="title_advanced_addresses">Visa adressuppgifter som standard</string>
+    <string name="title_advanced_actionbar">Konversationens åtgärdsfält</string>
     <string name="title_advanced_light">Använda aviseringslampan</string>
     <string name="title_advanced_sound">Välj aviseringsljud</string>
     <string name="title_advanced_pull_refresh">Dra ner för att uppdatera</string>
-    <string name="title_advanced_actionbar">Konversationens åtgärdsfält</string>
     <string name="title_advanced_autoclose">Stäng konversationer automatiskt</string>
     <string name="title_advanced_autonext">Gå automatiskt till nästa konversation vid stängning av konversation</string>
     <string name="title_advanced_autoread">Märk automatiskt meddelanden som lästa vid flyttning av meddelanden</string>
@@ -254,6 +254,7 @@
     <string name="title_open_with">Öppna med</string>
     <string name="title_no_answers">Inga svarsmallar definierade</string>
     <string name="title_no_viewer">Ingen visarapp tillgänglig för %1$s</string>
+    <string name="title_no_saf">Ramverk för lagringstillträde är inte tillgängligt</string>
     <string name="title_no_stream">En föråldrad app skickade en sökväg istället för en filström</string>
     <string name="title_no_contacts">Kontaktväljaren är inte tillgänglig</string>
     <string name="title_no_internet">Ingen internetanslutning</string>
@@ -267,7 +268,6 @@
     <string name="title_ask_delete_answer">Ta bort svarsmall permanent?</string>
     <string name="title_ask_delete_rule">Ta bort regel permanent?</string>
     <string name="title_ask_discard">Släng utkastet?</string>
-    <string name="title_ask_spam">Rapportera som skräppost?</string>
     <string name="title_ask_show_html">Att visa det ursprungliga meddelandet kan läcka sekretesskänslig information</string>
     <string name="title_ask_show_image">Att visa bilder kan läcka sekretesskänslig information</string>
     <string name="title_sync_queued">Synkronisering kommer att äga rum vid nästa kontoanslutning</string>

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

@@ -112,10 +112,10 @@
     <string name="title_advanced_identicons">Kimliklerini göster</string>
     <string name="title_advanced_preview">İleti önizlemesini göster</string>
     <string name="title_advanced_addresses">Öntanımlı olarak adres ayrıntılarını göster</string>
+    <string name="title_advanced_actionbar">İletişim etkinlik çubuğu</string>
     <string name="title_advanced_light">Bildirim ışığını kullan</string>
     <string name="title_advanced_sound">Bildirim sesini seçin</string>
     <string name="title_advanced_pull_refresh">Yenilemek için aşağıya çekin</string>
-    <string name="title_advanced_actionbar">İletişim etkinlik çubuğu</string>
     <string name="title_advanced_autoclose">İletişimleri otomatik olarak kapat</string>
     <string name="title_advanced_autoread">İleti taşındığında otomatik olarak okundu diye işaretle</string>
     <string name="title_advanced_collapse">Konuşmalardaki mesajları \'geri\' seçeneğinde daralt</string>
@@ -271,7 +271,6 @@
     <string name="title_ask_delete_answer">Yanıt kalıbı kalıcı olarak silinsin mi?</string>
     <string name="title_ask_delete_rule">Kural kalıcı olarak silinsin mi?</string>
     <string name="title_ask_discard">Taslak silinsin mi?</string>
-    <string name="title_ask_spam">İstenmeyen posta olarak bildirilsin mi?</string>
     <string name="title_ask_show_html">Özgün iletiyi göstermek gizliliğe duyarlı bilgilerin sızmasına neden olabilir</string>
     <string name="title_ask_show_image">Resimlerin gösterilmesi gizliliğe duyarlı bilgilerin sızmasına neden olabilir</string>
     <string name="title_sync_queued">Eşzamanlama bir sonraki hesap bağlantısında gerçekleşecek</string>

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

@@ -88,10 +88,10 @@
     <string name="title_advanced_avatars">显示联系人头像</string>
     <string name="title_advanced_identicons">显示哈希头像</string>
     <string name="title_advanced_preview">显示邮件预览</string>
+    <string name="title_advanced_actionbar">对话操作栏</string>
     <string name="title_advanced_light">使用指示灯</string>
     <string name="title_advanced_sound">选择通知提示音</string>
     <string name="title_advanced_pull_refresh">下拉刷新</string>
-    <string name="title_advanced_actionbar">对话操作栏</string>
     <string name="title_advanced_autoclose">自动关闭对话</string>
     <string name="title_advanced_autoread">将移动的邮件自动标记为已读</string>
     <string name="title_advanced_collapse">按返回键折叠对话中的邮件</string>
@@ -229,7 +229,6 @@
     <string name="title_ask_delete_selected">是否永久性删除选定的邮件？</string>
     <string name="title_ask_delete_answer">是否永久性删除回复模板？</string>
     <string name="title_ask_discard">丢弃草稿？</string>
-    <string name="title_ask_spam">报告为垃圾邮件？</string>
     <string name="title_ask_show_html">显示原件可能会泄露隐私敏感信息</string>
     <string name="title_ask_show_image">显示图像可能会泄露隐私敏感信息</string>
     <string name="title_sync_queued">同步将在下次账号连接时进行</string>

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

@@ -47,6 +47,11 @@
         <item quantity="other">Move %1$d messages to %2$s?</item>
     </plurals>
 
+    <plurals name="title_ask_spam">
+        <item quantity="one">Report %1$d message as spam?</item>
+        <item quantity="other">Report %1$d messages as spam?</item>
+    </plurals>
+
     <string name="title_notification_failed">\'%1$s\' failed</string>
 
     <string name="menu_setup">Setup</string>
@@ -317,7 +322,6 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_delete_rule">Delete rule permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
-    <string name="title_ask_spam">Report as spam?</string>
     <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
     <string name="title_sync_queued">Synchronization will take place on next account connection</string>