From 06ec8520906fa503d8da9a70519bf262b0067ab6 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 4 Jan 2014 01:44:31 +0100
Subject: [PATCH] Rename plurals to make Transifex happy

---
 res/values-ca/strings.xml                                    | 4 ++--
 res/values-cs/strings.xml                                    | 4 ++--
 res/values-da/strings.xml                                    | 2 +-
 res/values-de/strings.xml                                    | 4 ++--
 res/values-el/strings.xml                                    | 4 ++--
 res/values-es/strings.xml                                    | 2 +-
 res/values-fi/strings.xml                                    | 4 ++--
 res/values-fr/strings.xml                                    | 4 ++--
 res/values-hu/strings.xml                                    | 4 ++--
 res/values-it/strings.xml                                    | 4 ++--
 res/values-iw/strings.xml                                    | 2 +-
 res/values-ja/strings.xml                                    | 4 ++--
 res/values-ko/strings.xml                                    | 4 ++--
 res/values-nl/strings.xml                                    | 4 ++--
 res/values-pl/strings.xml                                    | 4 ++--
 res/values-pt-rBR/strings.xml                                | 4 ++--
 res/values-ru/strings.xml                                    | 4 ++--
 res/values-sk/strings.xml                                    | 4 ++--
 res/values-sv/strings.xml                                    | 4 ++--
 res/values-tr/strings.xml                                    | 2 +-
 res/values-uk/strings.xml                                    | 2 +-
 res/values-zh-rCN/strings.xml                                | 2 +-
 res/values-zh-rTW/strings.xml                                | 4 ++--
 res/values/strings.xml                                       | 4 ++--
 src/com/fsck/k9/activity/Accounts.java                       | 2 +-
 src/com/fsck/k9/activity/NotificationDeleteConfirmation.java | 2 +-
 26 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4e8371f2d..2759c3c97 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -981,7 +981,7 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Voleu eliminar aquest missatge?</item>
         <item quantity="other">Voleu eliminar <xliff:g id="message_count">%1$d</xliff:g> missatges?</item>
     </plurals>
@@ -1018,7 +1018,7 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="settings_export_success">S\'han exportat els paràmetres globals a <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">S\'han importat els paràmetres globals de <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">S\'ha importat <xliff:g id="accounts">%s</xliff:g> des de <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">un compte</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> comptes</item>
     </plurals>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7a8adae43..c28891705 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -984,7 +984,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Opravdu si přejete smazat tuto zprávu?</item>
         <item quantity="few">Opravdu si přejete smazat <xliff:g id="message_count">%1$d</xliff:g> zprávy?</item>
         <item quantity="other">Opravdu si přejete smazat <xliff:g id="message_count">%1$d</xliff:g> zpráv?</item>
@@ -1023,7 +1023,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="settings_export_success">Export nastavení uložen do <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Importovano globální nastaveni z <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importováno <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one"><xliff:g id="numAccounts">%s</xliff:g> účet</item><!-- added var in place of 1 účet -->
         <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> účty</item><!-- 2-4 need to be this and 5- other -->
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> účtů</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 19faf9932..3421249d4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1019,7 +1019,7 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="settings_export_success">Indstillinger gemt som <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Importerede globale indstillinger fra <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importerede <xliff:g id="accounts">%s</xliff:g> fra <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 konto</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> konti</item>
     </plurals>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ebfae9f52..7df1011f0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -978,7 +978,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Möchten Sie diese Nachricht wirklich löschen?</item>
         <item quantity="other">Möchten Sie wirklich <xliff:g id="message_count">%1$d</xliff:g> Nachrichten löschen?</item>
     </plurals>
@@ -1015,7 +1015,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="settings_export_success">Exportierte Einstellungen wurden erfolgreich nach <xliff:g id="filename">%s</xliff:g> gespeichert</string>
     <string name="settings_import_global_settings_success">Globale Einstellungen erfolgreich aus <xliff:g id="filename">%s</xliff:g> importiert</string>
     <string name="settings_import_success">\'<xliff:g id="accounts">%s</xliff:g>\' erfolgreich aus <xliff:g id="filename">%s</xliff:g> importiert</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 Konto</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> Konten</item>
     </plurals>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8ce94f0cd..9852d9964 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -979,7 +979,7 @@
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Θέλετε πράγματι να διαγράψετε αυτό το μήνυμα;</item>
         <item quantity="other">Θέλετε πράγματι να διαγράψετε <xliff:g id="message_count">%1$d</xliff:g> μηνύματα;</item>
     </plurals>
@@ -1016,7 +1016,7 @@
     <string name="settings_export_success">Οι εξαγόμενες ρυθμίσεις αποθηκεύτηκαν στο <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Ρυθμίσεις εισήχθηκαν από το <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Εισήχθηκαν <xliff:g id="accounts">%s</xliff:g> λογαριασμοί από το <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 λογαριασμός</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> λογαριασμοί</item>
     </plurals>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 89b50b6ce..b20ddf6e8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1018,7 +1018,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <string name="settings_export_success">Ajustes guardados en <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Ajustes globales importados desde <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importado <xliff:g id="accounts">%s</xliff:g> desde <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 cuenta</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> cuentas</item>
     </plurals>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 85657f0b3..7cdc8bdf4 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -980,7 +980,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Haluatko varmasti poistaa tämän viestin?</item>
         <item quantity="other">Haluatko varmasti poistaa <xliff:g id="message_count">%1$d</xliff:g> viestiä?</item>
     </plurals>
@@ -1017,7 +1017,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="settings_export_success">Viedyt asetukset tallennettu tiedostoon <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Yleiset asetukset tuotu tiedostosta <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Tuotu <xliff:g id="accounts">%s</xliff:g> tiedostosta <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 tili</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> tiliä</item>
     </plurals>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0b3dcabc6..01a545959 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1005,7 +1005,7 @@ de plus</string>
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Voulez-vous vraiment supprimer ce message?</item>
         <item quantity="other">Voulez-vous vraiment supprimer les <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
     </plurals>
@@ -1042,7 +1042,7 @@ de plus</string>
     <string name="settings_export_success">Paramètres exportés vers <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Paramètres globaux importés depuis <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importés <xliff:g id="accounts">%s</xliff:g> depuis <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 compte</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> comptes</item>
     </plurals>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 98931e670..2c915e277 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -980,7 +980,7 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Biztos hogy törli ezt a levelet?</item>
         <item quantity="other">Biztos hogy törli ezt: <xliff:g id="message_count">%1$d</xliff:g> ?</item>
     </plurals>
@@ -1017,7 +1017,7 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <string name="settings_export_success">Exportált beállítások mentve ide: <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Az általános beállítások importálva innen: <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">A(z) <xliff:g id="accounts">%s</xliff:g> importálva innen: <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 fiók</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> fiók</item>
     </plurals>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 476926fed..4718e0cf0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -979,7 +979,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Vuoi davvero eliminare questo messaggio?</item>
         <item quantity="other">Vuoi davvero eliminare i <xliff:g id="message_count">%1$d</xliff:g> messaggi selezionati?</item>
     </plurals>
@@ -1016,7 +1016,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="settings_export_success">Salvata esportazione impostazioni in <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Impostazioni globali importate da <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importato <xliff:g id="accounts">%s</xliff:g> da <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 account</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> account</item>
     </plurals>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 14d76d586..c203bd31d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1018,7 +1018,7 @@
     <string name="settings_export_success">יצוא הגדרות נשמרו ל <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">יבא הגדרות כלליות מ <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">יבא <xliff:g id="accounts">%s</xliff:g> מ <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">חשבון 1</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> חשבונות</item>
     </plurals>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 3a703074a..3d9b21e68 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -978,7 +978,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">本当にこのメッセージを削除しますか？</item>
         <item quantity="other">本当に<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを削除しますか？</item>
     </plurals>
@@ -1015,7 +1015,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="settings_export_success">設定を <xliff:g id="filename">%s</xliff:g> に保存しました。</string>
     <string name="settings_import_global_settings_success">グローバル設定を <xliff:g id="filename">%s</xliff:g> からインポートしました。</string>
     <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g> の設定を <xliff:g id="filename">%s</xliff:g> からインポートしました。</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 アカウント</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> アカウント</item>
     </plurals>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a8712d3a8..be8001f93 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -978,7 +978,7 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">정말 이 메시지를 삭제하겠습니까?</item>
         <item quantity="other">정말 <xliff:g id="message_count">%1$d</xliff:g> 통의 메시지를 삭제하겠습니까?</item>
     </plurals>
@@ -1015,7 +1015,7 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="settings_export_success">설정을 파일 <xliff:g id="filename">%s</xliff:g>로 내보냄</string>
     <string name="settings_import_global_settings_success">설정을 <xliff:g id="filename">%s</xliff:g>로부터 가져옴</string>
     <string name="settings_import_success"><xliff:g id="filename">%s</xliff:g>에서 <xliff:g id="accounts">%s</xliff:g>를 가져옴</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">계정 하나</item>
         <item quantity="other">계정 <xliff:g id="numAccounts">%s</xliff:g> 개</item>
     </plurals>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4abb8d660..e20001522 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -979,7 +979,7 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Wil je dit bericht echt verwijderen?</item>
         <item quantity="other">Wil je echt <xliff:g id="message_count">%1$d</xliff:g> berichten verwijderen?</item>
     </plurals>
@@ -1016,7 +1016,7 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <string name="settings_export_success">Geexporteerde instellingen opgeslagen in <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Globale instellingen geimporteerd van <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g> geimporteerd vanuit <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 account</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
     </plurals>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a1cda7f6e..196d73e94 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -990,7 +990,7 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Na pewno chcesz usunąć wiadomość?</item>
         <item quantity="other">Na pewno chcesz usunąć <xliff:g id="message_count">%1$d</xliff:g> wiadomości?</item>
     </plurals>
@@ -1027,7 +1027,7 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="settings_export_success">Zapisano ustawienia do <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Importowano ustawienia z <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importowano <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 konto</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> kont</item>
     </plurals>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1b73a040a..0f268d1c1 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -979,7 +979,7 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Deseja mesmo excluir esta mensagem?</item>
         <item quantity="other">Deseja mesmo excluir estas <xliff:g id="message_count">%1$d</xliff:g> mensagens?</item>
     </plurals>
@@ -1016,7 +1016,7 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="settings_export_success">Configurações salvas para <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Configurações importadas de <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importação concluída para <xliff:g id="accounts">%s</xliff:g> de <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 conta</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> contas</item>
     </plurals>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 685262522..d57859115 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -980,7 +980,7 @@ K-9 Mail — почтовый клиент для Android.
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Сообщение будет удалено. Продолжить?</item>
         <item quantity="other">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут удалены. Продолжить?</item>
     </plurals>
@@ -1017,7 +1017,7 @@ K-9 Mail — почтовый клиент для Android.
     <string name="settings_export_success">Настройки сохранены в <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Настройки K-9 импортированы из <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Импортировано: <xliff:g id="accounts">%s</xliff:g> из <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 ящик</item>
         <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> ящика</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> ящиков</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 846c47b8c..f20357e0a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -980,7 +980,7 @@ Prosím nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte s
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
     <item quantity="one">Vymazať túto správu?</item>
         <item quantity="few">Vymmazať <xliff:g id="message_count">%1$d</xliff:g> správy?</item>
         <item quantity="other">Vymazať <xliff:g id="message_count">%1$d</xliff:g> správ?</item>
@@ -1019,7 +1019,7 @@ Prosím nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte s
     <string name="settings_export_success">Exportované nastavenia boli uložené do <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Importované všeobecné nastavenia z <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importované: <xliff:g id="accounts">%s</xliff:g> z <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
     <item quantity="one">1 účet</item>
         <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> účty</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> účtov</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e5227bb8d..47cc1ba23 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -980,7 +980,7 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Vill du verkligen radera detta meddelande?</item>
         <item quantity="other">Vill du verkligen radera <xliff:g id="message_count">%1$d</xliff:g> meddelanden?</item>
     </plurals>
@@ -1017,7 +1017,7 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="settings_export_success">Sparade exporterade inställningar till <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Importerade globala inställningar från <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Importerade <xliff:g id="accounts">%s</xliff:g> från <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 konto</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> konton</item>
     </plurals>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1a8d8431c..152c515af 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1018,7 +1018,7 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="settings_export_success">Dışarı aktarılan ayarlar <xliff:g id="filename">%s</xliff:g> olarak kaydedildi.</string>
     <string name="settings_import_global_settings_success">Genel ayarlar <xliff:g id="filename">%s</xliff:g> dosyasından alındı</string>
     <string name="settings_import_success"><xliff:g id="accounts">%s</xliff:g>, <xliff:g id="filename">%s</xliff:g> dosyasından alındı</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 hesap</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> hesap</item>
     </plurals>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fffb9b920..4b8886260 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1018,7 +1018,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="settings_export_success">Налаштування були експортовані у <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Глобальні налаштування були імпортовані з <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Імпортовано <xliff:g id="accounts">%s</xliff:g> з <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 обліковий запис</item>
         <item quantity="few"><xliff:g id="numAccounts">%s</xliff:g> облікові записи</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> облікових записів</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5fa2e733f..0b9b941e5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1017,7 +1017,7 @@ K-9改进的功能包括：
     <string name="settings_export_success">设置已导出到<xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">全局设置已自<xliff:g id="filename">%s</xliff:g>导入</string>
     <string name="settings_import_success">账户<xliff:g id="accounts">%s</xliff:g>已自<xliff:g id="filename">%s</xliff:g>导入</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">单个账户</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> 账户</item>
     </plurals>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b4328c72b..3eb6532b3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -948,7 +948,7 @@
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="other">確定要刪除 %1$d 則訊息?</item>
         <item quantity="one">確定要刪除此訊息?</item>
     </plurals>
@@ -985,7 +985,7 @@
     <string name="settings_export_success">匯出的設定檔案已經儲存到 %s</string>
     <string name="settings_import_global_settings_success">從 %s 匯入全域設定檔案</string>
     <string name="settings_import_success" formatted="false">成功匯入 %s 從 %s</string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="other">%s 帳號</item>
         <item quantity="one">1 帳號</item>
     </plurals>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a79f1f6bd..23e764826 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -985,7 +985,7 @@ Please submit bug reports, contribute new features and ask questions at
       (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
 
     -->
-    <plurals name="dialog_confirm_delete_message">
+    <plurals name="dialog_confirm_delete_messages">
         <item quantity="one">Do you really want to delete this message?</item>
         <item quantity="other">Do you really want to delete <xliff:g id="message_count">%1$d</xliff:g> messages?</item>
     </plurals>
@@ -1022,7 +1022,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_global_settings_success">Imported global settings from <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>
-    <plurals name="settings_import_success">
+    <plurals name="settings_import_accounts">
         <item quantity="one">1 account</item>
         <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
     </plurals>
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 657191db1..9601d883e 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -1517,7 +1517,7 @@ public class Accounts extends K9ListActivity implements OnItemClickListener {
 
             int imported = mImportResults.importedAccounts.size();
             String accounts = activity.getResources().getQuantityString(
-                                  R.plurals.settings_import_success, imported, imported);
+                                  R.plurals.settings_import_accounts, imported, imported);
             return activity.getString(R.string.settings_import_success, accounts, mFilename);
         }
 
diff --git a/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java b/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java
index 200ad84ce..a740768c6 100644
--- a/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java
+++ b/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java
@@ -90,7 +90,7 @@ public class NotificationDeleteConfirmation extends Activity {
         case DIALOG_CONFIRM:
             int messageCount = mMessageRefs.size();
             alert.setMessage(getResources().getQuantityString(
-                    R.plurals.dialog_confirm_delete_message, messageCount, messageCount));
+                    R.plurals.dialog_confirm_delete_messages, messageCount, messageCount));
             break;
         }