diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b2e66e239..3f90a36a0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -989,17 +989,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Realment voleu moure aquest missatge a la carpeta brossa?</item>
         <item quantity="other">Realment voleu moure aquests missatges a la carpeta brossa?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for \'quantity\': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Sí</string>
     <string name="dialog_confirm_spam_cancel_button">No</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a6c2df1b3..5d35f1c81 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -992,17 +992,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
         <item quantity="one">Opravdu chcete přesunout tuto zprávy do nevyžádané pošty?</item>
         <item quantity="few">Opravdu chcete přesunout <xliff:g id="message_count">%1$d</xliff:g> zprávy do nevyžádané pošty?</item>
         <item quantity="other">Opravdu chcete přesunout <xliff:g id="message_count">%1$d</xliff:g> zpráv do nevyžádané pošty?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Ano</string>
     <string name="dialog_confirm_spam_cancel_button">Ne</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a90249cd6..04e3e2f64 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -983,17 +983,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Ønsker du virkelig at flytte denne meddelelse til spam mappen?</item>
         <item quantity="other">Ønsker du virkelig at flytte <xliff:g id="message_count">%1$d</xliff:g> meddelelser til spam mappen?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Ja</string>
     <string name="dialog_confirm_spam_cancel_button">Nej</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 171fe0b5b..c1c6c2265 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -978,17 +978,6 @@
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Θέλετε πράγματι να μετακινήσετε αυτό το μήνυμα στο φάκελο σκουπιδιών;</item>
         <item quantity="other">Θέλετε πράγματι να μετακινήσετε <xliff:g id="message_count">%1$d</xliff:g> μηνύματα στο φάκελο σκουπιδιών;</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Ναι</string>
     <string name="dialog_confirm_spam_cancel_button">Όχι</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 210d4503a..b5e4adbbe 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -991,17 +991,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Haluatko todella siirtää tämän viestin roskapostikansioon?</item>
         <item quantity="other">Haluatko todella siirtää <xliff:g id="message_count">%1$d</xliff:g> viestiä roskapostikansioon?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Kyllä</string>
     <string name="dialog_confirm_spam_cancel_button">Ei</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3af7b4d28..f7be222ab 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1020,17 +1020,6 @@ de plus</string>
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Voulez-vous déplacer ce message vers le dossiers à spams\u00A0?</item>
         <item quantity="other">Voulez-vous déplacer <xliff:g id="message_count">%1$d</xliff:g> messages vers le dossiers à spams\u00A0?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Déplacer</string>
     <string name="dialog_confirm_spam_cancel_button">Ne pas déplacer</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index ae17c0eaf..120475600 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -980,17 +980,6 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Queres mover esta mensaxe á carpeta spam?</item>
         <item quantity="other">Queres mover esta mensaxe á carpeta spam?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Si</string>
     <string name="dialog_confirm_spam_cancel_button">Non</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 95c23fbe4..08a0a839d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -980,17 +980,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <!--<plurals name="dialog_confirm_spam_message">
         <item quantity="one">Do you really want to move this message to the spam folder?</item>
         <item quantity="other">Do you really want to move <xliff:g id="message_count">%1$d</xliff:g> messages to the spam folder?</item>
-<!-/-
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--/->
     </plurals>-->
     <string name="dialog_confirm_spam_confirm_button">Igen</string>
     <string name="dialog_confirm_spam_cancel_button">Nem</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 92a156988..993ca9f96 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -984,17 +984,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Vuoi veramente spostare il messaggio nella cartella spam?</item>
         <item quantity="other">vuoi veramente spostare i messaggi <xliff:g id="message_count">%1$d</xliff:g> nella cartella spam?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Sì</string>
     <string name="dialog_confirm_spam_cancel_button">No</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 11eb8d0fd..c154c1648 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -982,12 +982,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">本当にこのメッセージを迷惑メールフォルダに移動しますか？</item>
         <item quantity="other">本当にこれら<xliff:g id="message_count">%1$d</xliff:g>件のメッセージを迷惑メールフォルダに移動しますか？</item>
-<!--
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">はい</string>
     <string name="dialog_confirm_spam_cancel_button">いいえ</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e59e5e8af..0eea12690 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -979,17 +979,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">정말 이 메시지를 스팸폴더로 옮기시겠습니까?</item>
         <item quantity="other">정말 메시지 <xliff:g id="message_count">%1$d</xliff:g>를 스팸폴더로 옮기시겠습니까?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">예</string>
     <string name="dialog_confirm_spam_cancel_button">아니오</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 96d18ee79..b398d54d2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -980,17 +980,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Wil je dit bericht echt verplaatsen naar de spam map?</item>
         <item quantity="other">Wil je dit bericht echt verplaatsen naar de spam map?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Ja</string>
     <string name="dialog_confirm_spam_cancel_button">Nee</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3441efac0..d8058886a 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -979,16 +979,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Deseja mesmo mover esta mensagem para a pasta de spam?</item>
         <item quantity="other">Deseja mesmo mover <xliff:g id="message_count">%1$d</xliff:g> mensagens para a pasta de spam?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Sim</string>
     <string name="dialog_confirm_spam_cancel_button">Não</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fed4d9aeb..d7b05f76b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -3,7 +3,7 @@
     <!-- === App-specific strings ============================================================= -->
 
     <!-- This should make it easier for forks to change the branding -->
-    
+
     <!-- Translation of RU version (06.07.2013): Igor Nedoboy (k9russian<AT>gmail<DOT>com) -->
 
     <!-- Used in AndroidManifest.xml -->
@@ -315,7 +315,7 @@ K-9 Mail — почтовый клиент для Android.
     <string name="global_settings_messageview_fixedwidth_summary">Показать сообщения в формате \"Только текст\" моноширинным шрифтом</string>
     <string name="global_settings_messageview_autofit_width_label">Вписать по ширине</string>
     <string name="global_settings_messageview_autofit_width_summary">Подогнать текст сообщения по ширине экрана</string>
-    
+
     <string name="global_settings_messageview_return_to_list_label">В список после удаления</string>
     <string name="global_settings_messageview_return_to_list_summary">Перейти в список сообщений после удаления сообщения</string>
     <string name="global_settings_messageview_show_next_label">В следующее после удаления</string>
@@ -982,17 +982,6 @@ K-9 Mail — почтовый клиент для Android.
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Сообщение будет перемещено в Спам. Продолжить?</item>
         <item quantity="other">Сообщения (<xliff:g id="message_count">%1$d</xliff:g> шт.) будут перемещены в Спам. Продолжить?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">ОК</string>
     <string name="dialog_confirm_spam_cancel_button">Отмена</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bab693905..1a4a09031 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -983,17 +983,6 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <!-- NEW: <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Do you really want to move this message to the spam folder?</item>
         <item quantity="other">Do you really want to move <xliff:g id="message_count">%1$d</xliff:g> messages to the spam folder?</item>
-<!-/-
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--/->
     </plurals>-->
     <!-- NEW: <string name="dialog_confirm_spam_confirm_button">Yes</string>-->
     <!-- NEW: <string name="dialog_confirm_spam_cancel_button">No</string>-->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c2b04dfa8..482ab9068 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -983,17 +983,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Bu mesajı gerçekten Spam klasörüne taşımak istiyor musunuz?</item>
         <item quantity="other"><xliff:g id="message_count">%1$d</xliff:g> mesajı Spam klasörüne gerçekten taşımak istiyor musunuz?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Evet</string>
     <string name="dialog_confirm_spam_cancel_button">Hayır</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 12e86bc35..a79fcb2c8 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -982,17 +982,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <plurals name="dialog_confirm_spam_message">
         <item quantity="one">Ви дійсно хочете перемістити це повідомлення у папку „Спам“?</item>
         <item quantity="other">Ви дійсно хочете перемістити <xliff:g id="message_count">%1$d</xliff:g> повідомлень у папку „Спам“?</item>
-<!--
-  Translators:
-
-  Please review how to handle pluralization for your language at (1) and ajust
-  the <item> elements accordingly
-
-  Possible values for 'quantity': zero, one, two, few, many, other
-
-  (1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-
--->
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Так</string>
     <string name="dialog_confirm_spam_cancel_button">Ні</string>