From 2a48ad2170dcfc930b5d3ae88565963fd0125c04 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 9 Jul 2013 23:09:51 +0200
Subject: [PATCH] Remove preference summary attribute when empty string was
 used

This will display the preference title vertically centered. Some
translations still had text for the summary, so their preference title
might need to be changed to adjust for possible loss of information.
---
 res/values-ca/strings.xml                | 3 ---
 res/values-cs/strings.xml                | 3 ---
 res/values-da/strings.xml                | 3 ---
 res/values-de/strings.xml                | 3 ---
 res/values-el/strings.xml                | 3 ---
 res/values-es/strings.xml                | 3 ---
 res/values-fi/strings.xml                | 3 ---
 res/values-fr/strings.xml                | 3 ---
 res/values-gl/strings.xml                | 3 ---
 res/values-hu/strings.xml                | 3 ---
 res/values-it/strings.xml                | 3 ---
 res/values-iw/strings.xml                | 3 ---
 res/values-ja/strings.xml                | 3 ---
 res/values-ko/strings.xml                | 3 ---
 res/values-nl/strings.xml                | 3 ---
 res/values-pl/strings.xml                | 3 ---
 res/values-pt-rBR/strings.xml            | 3 ---
 res/values-ru/strings.xml                | 3 ---
 res/values-sv/strings.xml                | 3 ---
 res/values-tr/strings.xml                | 3 ---
 res/values-uk/strings.xml                | 3 ---
 res/values-zh-rCN/strings.xml            | 3 ---
 res/values-zh-rTW/strings.xml            | 3 ---
 res/values/strings.xml                   | 3 ---
 res/xml/account_settings_preferences.xml | 3 +--
 res/xml/global_preferences.xml           | 2 --
 26 files changed, 1 insertion(+), 76 deletions(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2763df227..decc02bc4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -544,7 +544,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="account_settings_message_format_auto">Automàtic (text net excepte per missatges HTML)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Mostra sempre C/a i C/a ocults</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Mostra sempre els camps C/a i C/a ocult</string>
 
     <string name="account_settings_message_read_receipt_label">Confirmació de lectura</string>
     <string name="account_settings_message_read_receipt_summary">Sempre es realitzen peticions de confirmació de lectura.</string>
@@ -859,12 +858,10 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="gestures_summary">Accepta el control de gestos</string>
 
     <string name="volume_navigation_title">Navegació botons de volum</string>
-    <string name="volume_navigation_summary">Canvia a través dels elements utilitzant els botons de volum</string>
     <string name="volume_navigation_message">Vista del missatge</string>
     <string name="volume_navigation_list">Vista de diverses de llistes</string>
 
     <string name="start_integrated_inbox_title">Comença bústia unificada</string>
-    <string name="start_integrated_inbox_summary">Mostra la bústia unificada després de començar</string>
 
     <string name="measure_accounts_title">Mostra mida compte</string>
     <string name="measure_accounts_summary">Apaga-ho perquè es mostri més ràpid</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2814c6cf8..be73ed19d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -548,7 +548,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="account_settings_message_format_auto">Automaticky (prostý text dokud neodpovídáte na zprávu v HTML formátu)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Vždy zobrazit kopie/skrytá</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Vždy zobrazit řádky kopie a skrytá kopie</string>
 
     <string name="account_settings_message_read_receipt_label">Potvrzení o přečtení</string>
     <string name="account_settings_message_read_receipt_summary">Vždy požadovat potvrzení o přečtení</string>
@@ -862,12 +861,10 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="gestures_summary">Používat ovládání gesty</string>
 
     <string name="volume_navigation_title">Navigace tlačítky hlasitosti</string>
-    <string name="volume_navigation_summary">Přeskakovat přes položky při použití ovladačů hlasitosti</string>
     <string name="volume_navigation_message">Zobrazení zpráv</string>
     <string name="volume_navigation_list">Různá zobrazení seznamů</string>
 
     <string name="start_integrated_inbox_title">Začít v Integrovaná doručené poště</string>
-    <string name="start_integrated_inbox_summary">Po startu zobrazit Integrovanou doručenou poštu</string>
 
     <string name="measure_accounts_title">Zobrazit velikost účtu</string>
     <string name="measure_accounts_summary">Vypněte pro rychlejší zobrazování</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 00a868f45..b159cd1be 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -544,7 +544,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="account_settings_message_format_auto">Automatisk (ren tekst med mindre mail som besvares er i HTML format)</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Kvittering for modtagelse</string>
     <string name="account_settings_message_read_receipt_summary">Anmod altid om kvittering for modtagelse</string>
@@ -857,12 +856,10 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="gestures_summary">Benyt gesture kontrol</string>
 
     <string name="volume_navigation_title">Volume-knap navigation</string>
-    <string name="volume_navigation_summary">Skift mellem valg vha. volume-knapper</string>
     <string name="volume_navigation_message">Mail-visning</string>
     <string name="volume_navigation_list">Diverse listevisninger</string>
 
     <string name="start_integrated_inbox_title">Start i fælles indbakke</string>
-    <string name="start_integrated_inbox_summary">Vis indhold af fælles indbakke ved opstart</string>
 
     <string name="measure_accounts_title">Vis størrelse på konto</string>
     <string name="measure_accounts_summary">Deaktiver for hurtigere visning</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7afd74dee..f0c0076a7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -544,7 +544,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="account_settings_message_format_auto">Automatisch</string>
 
     <string name="account_settings_always_show_cc_bcc_label">CC/BCC immer anzeigen</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Texteingabefelder für CC und BCC immer anzeigen</string>
 
     <string name="account_settings_message_read_receipt_label">Empfangsbestätigung</string>
     <string name="account_settings_message_read_receipt_summary">Immer eine Empfangsbestätigung anfordern</string>
@@ -858,12 +857,10 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="gestures_summary">Gesten für vorherige/nächste Nachricht aktivieren</string>
 
     <string name="volume_navigation_title">Lauter/Leiser-Navigation</string>
-    <string name="volume_navigation_summary">Mittels Lauter/Leiser-Tasten durch Listen navigieren</string>
     <string name="volume_navigation_message">Nachrichtenansicht</string>
     <string name="volume_navigation_list">Diverse Listenansichten</string>
 
     <string name="start_integrated_inbox_title">Gemeins. Posteingang bei Start</string>
-    <string name="start_integrated_inbox_summary">Beim Programmstart gemeinsamen Posteingang anzeigen</string>
 
     <string name="measure_accounts_title">Konto-Größe anzeigen</string>
     <string name="measure_accounts_summary">Für schnellere Anzeige deaktivieren</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 52f4047e2..bc47bee94 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -539,7 +539,6 @@
     <string name="account_settings_message_format_auto">Αυτόματα (απλό κείμενο, εκτός αν απαντά σε μήνυμα HTML)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Πάντα προβολή κοινοποιήσεων/ιδ. κοιν.</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Πάντα προβολή πεδίου κειμένου κοινοποιήσεων/ιδ. κοιν.</string>
 
     <string name="account_settings_message_read_receipt_label">Απόδειξη ανάγνωσης</string>
     <string name="account_settings_message_read_receipt_summary">Πάντοτε να απαιτείται απόδειξη ανάγνωσης</string>
@@ -853,12 +852,10 @@
     <string name="gestures_summary">Αποδοχή ελέγχου με χειρονομίες</string>
 
     <string name="volume_navigation_title">Πλοήγηση με πλήκτρο έντασης</string>
-    <string name="volume_navigation_summary">Μετακίνηση στις επιλογές με χρήση του πλήκτρου έντασης</string>
     <string name="volume_navigation_message">Προβολή μηνύματος</string>
     <string name="volume_navigation_list">Διάφορες προβολές λίστας</string>
 
     <string name="start_integrated_inbox_title">Εκκίνηση στα ενιαία εισερχόμενα</string>
-    <string name="start_integrated_inbox_summary">Προβολή των \'Ενιαίων Εισερχόμενων\' κατά την εκκίνηση</string>
 
     <string name="measure_accounts_title">Προβολή μεγέθους λογαριασμού</string>
     <string name="measure_accounts_summary">Απενεργοποιήστε το για ταχύτητα.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3b4abe950..fae4bf27b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -543,7 +543,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <string name="account_settings_message_format_auto">Automática (texto simple excepto si se responde a un mensaje HTML)</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Confirmación de lectura</string>
     <string name="account_settings_message_read_receipt_summary">Solicitar siempre confirmación de lectura</string>
@@ -855,12 +854,10 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
     <string name="gestures_summary">Aceptar controles gestuales</string>
 
     <string name="volume_navigation_title">Navegación con teclas de volumen</string>
-    <string name="volume_navigation_summary">Permite moverse por las opciones utilizando los botones de volumen</string>
     <string name="volume_navigation_message">Vista de mensaje</string>
     <string name="volume_navigation_list">Listas de mensajes</string>
 
     <string name="start_integrated_inbox_title">Usar Bandeja inificada</string>
-    <string name="start_integrated_inbox_summary">Mostrar una Bandeja de entrada unificada al inicio</string>
 
     <string name="measure_accounts_title">Tamaño cuenta</string>
     <string name="measure_accounts_summary">Desactivar para mejorar rendimiento</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 48150f352..4e5b8597b 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -545,7 +545,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="account_settings_message_format_auto">Automaattinen (pelkkä teksti, ellei vastata HTML-viestiin)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Näytä aina Kopio/Piilokopio</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Näytä aina Kopio/Piilokopio-tekstinsyöttökentät</string>
 
     <string name="account_settings_message_read_receipt_label">Vastaanottokuittaus</string>
     <string name="account_settings_message_read_receipt_summary">Pyydä aina vastaanottokuittaus</string>
@@ -859,12 +858,10 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="gestures_summary">Hyväksy eleohjaus</string>
 
     <string name="volume_navigation_title">Navigointi äänenvoimakkuusnäppäimillä</string>
-    <string name="volume_navigation_summary">Selaa käyttämällä äänenvoimakkuusnäppäimiä</string>
     <string name="volume_navigation_message">Viestinäkymä</string>
     <string name="volume_navigation_list">Erilaisia listanäkymiä</string>
 
     <string name="start_integrated_inbox_title">Aloita yhdistetystä Saapuneet-kansiosta</string>
-    <string name="start_integrated_inbox_summary">Näytä Yhdistetty Saapuneet-kansio ohjelman käynnistyksen jälkeen</string>
 
     <string name="measure_accounts_title">Näytä tilin koko</string>
     <string name="measure_accounts_summary">Poista käytöstä suorituskyvyn parantamiseksi</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 94340eb28..2f44d47dd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -569,7 +569,6 @@ de plus</string>
     <string name="account_settings_message_format_auto">Automatique (Text brut à moins de répondre à un message HTML)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Toujours afficher Cc/Cci</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Toujours afficher les champs Copie et Copie cachée</string>
 
     <string name="account_settings_message_read_receipt_label">Accusé de réception</string>
     <string name="account_settings_message_read_receipt_summary">Toujours demander un accusé de réception</string>
@@ -883,12 +882,10 @@ de plus</string>
     <string name="gestures_summary">Accepter le contrôle par gestuelle</string>
 
     <string name="volume_navigation_title">Navigation à l\'aide du volume</string>
-    <string name="volume_navigation_summary">Passer d\'un élément à l\'autre grâce aux touches de volume</string>
     <string name="volume_navigation_message">Visualisation d\'un message</string>
     <string name="volume_navigation_list">Différents écrans à liste</string>
 
     <string name="start_integrated_inbox_title">Boîte de messagerie unifiée au démarrage</string>
-    <string name="start_integrated_inbox_summary">Afficher la boîte de messagerie unifiée au démarrage</string>
 
     <string name="measure_accounts_title">Afficher la taille du compte</string>
     <string name="measure_accounts_summary">Désactiver pour un affichage plus rapide</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 9c1e78ea1..e66d044a9 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -543,7 +543,6 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic</string>-->
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
@@ -855,12 +854,10 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <string name="gestures_summary">Aceptar controles xestuáis</string>
 
     <string name="volume_navigation_title">Navegación con teclas de volume</string>
-    <string name="volume_navigation_summary">Permite moverse polas opcións usando os botóns de volume</string>
     <string name="volume_navigation_message">Vista de mensaxe</string>
     <string name="volume_navigation_list">Listas de mensaxes</string>
 
     <string name="start_integrated_inbox_title">Iniciar na Bandexa unificada</string>
-    <string name="start_integrated_inbox_summary">Amosar a Bandexa de Entrada unificada ao inicio</string>
 
     <string name="measure_accounts_title">Tamaño conta</string>
     <string name="measure_accounts_summary">Desactivar para mellorar rendimento</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e07de7667..daed19dd8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -544,7 +544,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic</string>-->
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
@@ -854,12 +853,10 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <string name="gestures_summary">Engedélyezi a kézmozdulakkal való vezérlést.</string>
 
     <string name="volume_navigation_title">Hangerő gomb vezérlés</string>
-    <string name="volume_navigation_summary">Léptetés az hangerő gombokkal</string>
     <string name="volume_navigation_message">Leveleknél</string>
     <string name="volume_navigation_list">Lista nézetek váltása</string>
 
     <string name="start_integrated_inbox_title">Kezdőlap az Összevont mappa</string>
-    <string name="start_integrated_inbox_summary">Összes beérkezett levél mappa jelenjen meg indításkor</string>
 
     <string name="measure_accounts_title">Mutassa a fiókok méretét</string>
     <string name="measure_accounts_summary">Kikapcsolva gyorsabb működés</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1f5d73d45..10cc3ce03 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -544,7 +544,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="account_settings_message_format_auto">Automatico (A meno che si risponda a un testo HTML)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Mostra sempre CC/Ccn</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Mostra sempre i campi CC/Ccn</string>
 
     <string name="account_settings_message_read_receipt_label">Notifica di lettura</string>
     <string name="account_settings_message_read_receipt_summary">Richiedi sempre la notifica di lettura</string>
@@ -858,12 +857,10 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="gestures_summary">Attiva la gestione con il tocco dei controlli</string>
 
     <string name="volume_navigation_title">Navigazione tasti volume</string>
-    <string name="volume_navigation_summary">Scorri elementi utilizzando i controlli del volume</string>
     <string name="volume_navigation_message">Visualizzazione messaggi</string>
     <string name="volume_navigation_list">Diverse visualizzazioni di elenco</string>
 
     <string name="start_integrated_inbox_title">Avvia in Posta in arrivo unificata</string>
-    <string name="start_integrated_inbox_summary">Visualizza la Posta in arrivo unificata dopo l\'avvio</string>
 
     <string name="measure_accounts_title">Visualizza dimensione account</string>
     <string name="measure_accounts_summary">Disattiva per una visualizzazione più veloce</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 63e4f005b..72d6e59b8 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -544,7 +544,6 @@
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic</string>-->
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">אישור קריאה</string>
     <string name="account_settings_message_read_receipt_summary">תמיד בקש אישור קריאה</string>
@@ -852,12 +851,10 @@
     <string name="gestures_summary">קבל כפתור מחווה</string>
 
     <string name="volume_navigation_title">נייוט באמצעות מקשי הווליום</string>
-    <string name="volume_navigation_summary">לדפדף בין הפריטים באמצעות מקשי הווליום</string>
     <string name="volume_navigation_message">הצגת הודעה</string>
     <string name="volume_navigation_list">רשימת תצוגות שונות</string>
 
     <string name="start_integrated_inbox_title">התחל בתיבת דואר נכנס אחידה</string>
-    <string name="start_integrated_inbox_summary">הצג את תיבת הדואר הנכנס האחידה בהפעלה</string>
 
     <string name="measure_accounts_title">הראה גודל חשבון</string>
     <string name="measure_accounts_summary">כבה בשביל תצוגה מהירה יותר</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index aee74bde4..2849d8ecf 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -543,7 +543,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="account_settings_message_format_auto">自動</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Cc/Bccを常に表示</string>
-    <string name="account_settings_always_show_cc_bcc_summary"/>
 
     <string name="account_settings_message_read_receipt_label">開封確認</string>
     <string name="account_settings_message_read_receipt_summary">常に開封確認を要求する</string>
@@ -852,12 +851,10 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="gestures_summary">ジェスチャー制御を有効にする</string>
 
     <string name="volume_navigation_title">ボリュームキー操作</string>
-    <string name="volume_navigation_summary"/>
     <string name="volume_navigation_message">メッセージ表示</string>
     <string name="volume_navigation_list">一覧表示</string>
 
     <string name="start_integrated_inbox_title">統合フォルダで始める</string>
-    <string name="start_integrated_inbox_summary"/>
 
     <string name="measure_accounts_title">アカウントのサイズ表示</string>
     <string name="measure_accounts_summary">表示を速くしたい場合はチェックしない</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8d995d13b..db9f1ba51 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -542,7 +542,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="account_settings_message_format_auto">자동 (HTML에 답장하지 않을 경우 평문)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">CC/BCC 항상 보기</string>
-    <string name="account_settings_always_show_cc_bcc_summary">참조/숨은 참조 입력칸을 항상 보입니다</string>
 
     <string name="account_settings_message_read_receipt_label">읽음 확인</string>
     <string name="account_settings_message_read_receipt_summary">항상 읽음 확인을 요청합니다</string>
@@ -854,12 +853,10 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="gestures_summary">제스처를 이용합니다</string>
 
     <string name="volume_navigation_title">볼륨 키 탐색</string>
-    <string name="volume_navigation_summary">볼륨 키로 메시지 목록의 각 항목을 넘김</string>
     <string name="volume_navigation_message">메시지 뷰</string>
     <string name="volume_navigation_list">다양한 리스트 뷰</string>
 
     <string name="start_integrated_inbox_title">통합 편지함으로 시작</string>
-    <string name="start_integrated_inbox_summary">통합 편지함을 시작시 보여 줍니다</string>
 
     <string name="measure_accounts_title">계정 용량을 보여 줍니다</string>
     <string name="measure_accounts_summary">빠른 처리를 위해 비활성화</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0b6b5cd0e..50392bcb5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -543,7 +543,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic</string>-->
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
@@ -854,12 +853,10 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <string name="gestures_summary">Accepteer gebaren sturing</string>
 
     <string name="volume_navigation_title">Volume op/neer navigatie</string>
-    <string name="volume_navigation_summary">Spring tussen items door gebruik van de volumeknoppen</string>
     <string name="volume_navigation_message">Bericht beeld</string>
     <string name="volume_navigation_list">Variabele lijst beelden</string>
 
     <string name="start_integrated_inbox_title">Geïntegreerde Inbox bij start</string>
-    <string name="start_integrated_inbox_summary">Laat de geïntegreerde Inbox zien na opstarten</string>
 
     <string name="measure_accounts_title">Laat account grootte zien</string>
     <string name="measure_accounts_summary">Zet uit voor sneller beeldscherm</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8a27bab6c..0a198598b 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -551,7 +551,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="account_settings_message_format_auto">Automatycznie (czysty tekst, chyba że odpoiwadasz na wiadomość HTML)</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Potwierdzenie przeczytania</string>
     <string name="account_settings_message_read_receipt_summary">Zawsze wymagaj potwierdzenia o przeczytaniu</string>
@@ -865,12 +864,10 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="gestures_summary">Pozwól na sterowanie gestami</string>
 
     <string name="volume_navigation_title">Nawigacja przyciskiem głośności</string>
-    <string name="volume_navigation_summary">Przeskakuj między rzeczami używając przycisków głośności</string>
     <string name="volume_navigation_message">Wygląd wiadomości</string>
     <string name="volume_navigation_list">Różne widoki list</string>
 
     <string name="start_integrated_inbox_title">Pokaż zintegrowaną</string>
-    <string name="start_integrated_inbox_summary">Wyświetl \"Zintegrowana odbiorcza\" po uruchomieniu programu</string>
 
     <string name="measure_accounts_title">Pokazuj rozmiary kont</string>
     <string name="measure_accounts_summary">Wyłącz, aby przyspieszyć wyświetlanie</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 9458971f4..250bab8b0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -540,7 +540,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="account_settings_message_format_auto">Automático (texto plano exceto ao responder uma mensagem em HTML)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Sempre exibir CC/CCO</string>
-    <string name="account_settings_always_show_cc_bcc_summary">Sempre exibir os campos CC/CCO</string>
 
     <string name="account_settings_message_read_receipt_label">Confirmação de leitura</string>
     <string name="account_settings_message_read_receipt_summary">Sempre solicitar confirmação de leitura</string>
@@ -853,12 +852,10 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="gestures_summary">Aceitar controle de gestos</string>
 
     <string name="volume_navigation_title">Tecla de volume para navegação</string>
-    <string name="volume_navigation_summary">Percorrer itens usando controle de volume</string>
     <string name="volume_navigation_message">Visualizar mensagem</string>
     <string name="volume_navigation_list">Vários modos de exibição da lista</string>
 
     <string name="start_integrated_inbox_title">Iniciar na Caixa de Entrada Unificada</string>
-    <string name="start_integrated_inbox_summary">Mostra Caixas Unificadas ao abrir o K-9 Mail</string>
 
     <string name="measure_accounts_title">Mostrar tamanho da conta</string>
     <string name="measure_accounts_summary">Desligar visualização rápida</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index eb7d6f09d..8bddbe65a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -539,7 +539,6 @@ K-9 Mail — почтовый клиент для Android.
     <string name="account_settings_message_format_auto">Автоматически</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Включать Копия/Скрытая</string>
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Уведомление о прочтении</string>
     <string name="account_settings_message_read_receipt_summary">Всегда запрашивать уведомление о прочтении</string>
@@ -852,12 +851,10 @@ K-9 Mail — почтовый клиент для Android.
     <string name="gestures_summary">Управление жестами</string>
 
     <string name="volume_navigation_title">Прокрутка кнопками Vol+/-</string>
-    <!-- NEW: <string name="volume_navigation_summary"/>-->
     <string name="volume_navigation_message">В сообщении</string>
     <string name="volume_navigation_list">В списке</string>
 
     <string name="start_integrated_inbox_title">Во \"Входящие\" при запуске</string>
-    <!-- NEW: <string name="start_integrated_inbox_summary"/>-->
 
     <string name="measure_accounts_title">Размер ящика</string>
     <string name="measure_accounts_summary">Отключите для ускорения работы</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index e02dd806f..660722df0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -544,7 +544,6 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <!-- NEW: <string name="account_settings_message_format_auto">Automatic</string>-->
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
     <!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
@@ -857,12 +856,10 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="gestures_summary">Acceptera gestkontroll</string>
 
     <string name="volume_navigation_title">Volym upp/ner-navigering</string>
-    <string name="volume_navigation_summary">Växla mellan val med hjälp av volymkontrollerna</string>
     <string name="volume_navigation_message">E-post-vy</string>
     <string name="volume_navigation_list">Diverse listvyer</string>
 
     <string name="start_integrated_inbox_title">Integrerad inkorg vid start</string>
-    <string name="start_integrated_inbox_summary">Visa den integrerade inkorgen vid start</string>
 
     <string name="measure_accounts_title">Visa kontostorlek</string>
     <string name="measure_accounts_summary">Avaktivera för snabbare visning</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8bccdbea8..12dc49ed6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -544,7 +544,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="account_settings_message_format_auto">Otomatik (HTML mesajına yanıt verilmiyorsa düz metin)</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Okundu raporu</string>
     <string name="account_settings_message_read_receipt_summary">Daima bir okuma raporu iste</string>
@@ -857,12 +856,10 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="gestures_summary">Hareket kontrolünü kabul et</string>
 
     <string name="volume_navigation_title">Ses Düğmesi ile dolaşma</string>
-    <string name="volume_navigation_summary">Ses kontrollerini kullanarak ürün sayfalarını çevir</string>
     <string name="volume_navigation_message">Mesaj görünümü</string>
     <string name="volume_navigation_list">Çeşitli liste görünümleri</string>
 
     <string name="start_integrated_inbox_title">Birleşik Gelen Kutusu ile başla</string>
-    <string name="start_integrated_inbox_summary">Başlangıçta Birleşik Gelen Kutusunu göster</string>
 
     <string name="measure_accounts_title">Hesap boyutunu göster</string>
     <string name="measure_accounts_summary">Daha hızlı görüntüleme için kapatın</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0d8e3b841..db0451084 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -544,7 +544,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="account_settings_message_format_auto">Автоматичний (plain text unless replying to an HTML message)</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">Повідомлення про прочитання</string>
     <string name="account_settings_message_read_receipt_summary">Завжди запитувати повідомлення про прочитання</string>
@@ -856,12 +855,10 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="gestures_summary">Приймати управління жестами</string>
 
     <string name="volume_navigation_title">Використовувати управління гучністю для навігації</string>
-    <string name="volume_navigation_summary">Прокручування елементів за допомогою клавіш управління гучності</string>
     <string name="volume_navigation_message">Перегляд повідомлень</string>
     <string name="volume_navigation_list">Різноманітні списки елементів</string>
 
     <string name="start_integrated_inbox_title">При запуску відкривати спільну папку „Вхідні“</string>
-    <string name="start_integrated_inbox_summary">Показати спільну папку „Вхідні“ після запуску</string>
 
     <string name="measure_accounts_title">Показувати розмір скриньки</string>
     <string name="measure_accounts_summary">Вимкнути для швидкого відображення</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a9eab0dfe..66f9a29fb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -537,7 +537,6 @@ K-9改进的功能包括：
     <string name="account_settings_message_format_auto">自动（纯文本，除非是在回复HTML邮件）</string>
 
     <!-- NEW: <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>-->
-    <!-- NEW: <string name="account_settings_always_show_cc_bcc_summary"/>-->
 
     <string name="account_settings_message_read_receipt_label">已读回执</string>
     <string name="account_settings_message_read_receipt_summary">总是要求已读回执</string>
@@ -847,12 +846,10 @@ K-9改进的功能包括：
     <string name="gestures_summary">接收手势控制</string>
 
     <string name="volume_navigation_title">音量键导航</string>
-    <string name="volume_navigation_summary">利用音量键选择项目</string>
     <string name="volume_navigation_message">信息视图</string>
     <string name="volume_navigation_list">不同的列表视图</string>
 
     <string name="start_integrated_inbox_title">从全局收件箱启动</string>
-    <string name="start_integrated_inbox_summary">启动后显示全局收件箱</string>
 
     <string name="measure_accounts_title">显示账户占用的空间</string>
     <string name="measure_accounts_summary">关闭该功能以便加快显示速度</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 21e66364f..055b270e9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -516,7 +516,6 @@
     <string name="account_settings_message_format_auto">自動 (除非回覆HTML格式信件，否則以純文字處理)</string>
 
     <string name="account_settings_always_show_cc_bcc_label">預設顯示副本/密件副本</string>
-    <string name="account_settings_always_show_cc_bcc_summary">在文字輸入框內顯示副本/密件副本</string>
 
     <string name="account_settings_message_read_receipt_label">讀取回條</string>
     <string name="account_settings_message_read_receipt_summary">永遠要求讀取回條</string>
@@ -819,12 +818,10 @@
     <string name="gestures_summary">接收手勢控制</string>
 
     <string name="volume_navigation_title">音量鍵導航</string>
-    <string name="volume_navigation_summary">利用音量鍵選擇項目</string>
     <string name="volume_navigation_message">訊息檢視</string>
     <string name="volume_navigation_list">不同的訊息檢視列表</string>
 
     <string name="start_integrated_inbox_title">從全域收件匣啟動</string>
-    <string name="start_integrated_inbox_summary">啟動後顯示全域收件匣</string>
 
     <string name="measure_accounts_title">顯示帳戶佔用的空間</string>
     <string name="measure_accounts_summary">關閉該功能以便加快顯示速度</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 226aae63c..f04f9db26 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -549,7 +549,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="account_settings_message_format_auto">Automatic</string>
 
     <string name="account_settings_always_show_cc_bcc_label">Always show Cc/Bcc</string>
-    <string name="account_settings_always_show_cc_bcc_summary"></string>
 
     <string name="account_settings_message_read_receipt_label">Read receipt</string>
     <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>
@@ -863,12 +862,10 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="gestures_summary">Enable gesture control</string>
 
     <string name="volume_navigation_title">Volume key navigation</string>
-    <string name="volume_navigation_summary"></string>
     <string name="volume_navigation_message">In message views</string>
     <string name="volume_navigation_list">In list views</string>
 
     <string name="start_integrated_inbox_title">Start in Unified Inbox</string>
-    <string name="start_integrated_inbox_summary"></string>
 
     <string name="measure_accounts_title">Show account size</string>
     <string name="measure_accounts_summary">Turn off for faster display</string>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index e99a8ec12..3bcf2adef 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -205,8 +205,7 @@
         <CheckBoxPreference
             android:persistent="false"
             android:key="always_show_cc_bcc"
-            android:title="@string/account_settings_always_show_cc_bcc_label"
-            android:summary="@string/account_settings_always_show_cc_bcc_summary" />
+            android:title="@string/account_settings_always_show_cc_bcc_label" />
 
         <CheckBoxPreference
         android:persistent="false"
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index ef3ecd56f..8d4c1ee15 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -235,7 +235,6 @@
             android:persistent="false"
             android:key="start_integrated_inbox"
             android:title="@string/start_integrated_inbox_title"
-            android:summary="@string/start_integrated_inbox_summary"
             android:dependency="hide_special_accounts" />
 
         <CheckBoxPreference
@@ -248,7 +247,6 @@
             android:persistent="false"
             android:key="volumeNavigation"
             android:title="@string/volume_navigation_title"
-            android:summary="@string/volume_navigation_summary"
             android:dialogTitle="@string/volume_navigation_title"
             android:positiveButtonText="@android:string/ok"
             android:negativeButtonText="@android:string/cancel" />