From cac85a29d4c5a725c1e03b663d4b236bfbdb2617 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Fri, 16 Aug 2013 03:02:08 -0400
Subject: [PATCH] partially revert "Remove unused strings" - bring back our
 "stars" preference

This reverts commit 4e8c8e35de1afb9ec926edaae9fcd8fde892d584.

Conflicts:
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rBR/strings.xml
	res/values-ru/strings.xml
	res/values-sv/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values/strings.xml
---
 res/values-ca/strings.xml     | 2 ++
 res/values-cs/strings.xml     | 2 ++
 res/values-da/strings.xml     | 2 ++
 res/values-de/strings.xml     | 2 ++
 res/values-el/strings.xml     | 2 ++
 res/values-es/strings.xml     | 2 ++
 res/values-fi/strings.xml     | 2 ++
 res/values-fr/strings.xml     | 2 ++
 res/values-gl/strings.xml     | 2 ++
 res/values-hu/strings.xml     | 2 ++
 res/values-it/strings.xml     | 2 ++
 res/values-iw/strings.xml     | 2 ++
 res/values-ja/strings.xml     | 2 ++
 res/values-ko/strings.xml     | 2 ++
 res/values-nl/strings.xml     | 2 ++
 res/values-pl/strings.xml     | 2 ++
 res/values-pt-rBR/strings.xml | 2 ++
 res/values-ru/strings.xml     | 2 ++
 res/values-sv/strings.xml     | 2 ++
 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 | 2 ++
 res/values/strings.xml        | 2 ++
 24 files changed, 48 insertions(+)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 69397b322..a807b93fb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -298,6 +298,8 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
     <string name="message_discarded_toast">S\'ha descartat el missatge</string>
     <string name="message_saved_toast">S\'ha desat el missatge com a esborrany</string>
 
+    <string name="global_settings_flag_label">Mostra estels</string>
+    <string name="global_settings_flag_summary">Els estels indiquen els missatges senyalats</string>
     <string name="global_settings_checkbox_label">Selecció múltiple</string>
     <string name="global_settings_checkbox_summary">Ensenya sempre la selecció múltiple</string>
     <string name="global_settings_preview_lines_label">Previsualització de línies</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e1acb7792..17cbe380b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -302,6 +302,8 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
     <string name="message_discarded_toast">Zpráva byla zrušena</string>
     <string name="message_saved_toast">Zpráva byla uložena jako koncept</string>
 
+    <string name="global_settings_flag_label">Zprávy s \u2605</string>
+    <string name="global_settings_flag_summary">Hvězdička indikuje označenou zprávu</string>
     <string name="global_settings_checkbox_label">Výběrová zaškrtávací pole</string>
     <string name="global_settings_checkbox_summary">Vždy zobrazovat výběrová zaškrtávací pole</string>
     <string name="global_settings_preview_lines_label">Počet řádků náhledu</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2bc1c7ad6..c92a34e46 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -298,6 +298,8 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
     <string name="message_discarded_toast">Mail kasseret</string>
     <string name="message_saved_toast">Mail gemt som kladde</string>
 
+    <string name="global_settings_flag_label">Vis stjerner</string>
+    <string name="global_settings_flag_summary">Stjerne indikerer mails med flag</string>
     <string name="global_settings_checkbox_label">Checkbokse for multible valg</string>
     <string name="global_settings_checkbox_summary">Vis altid checkbokse for multible valg</string>
     <string name="global_settings_preview_lines_label">Linier i forhåndsvisning</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3bfd736a0..0bbd6e9f3 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -298,6 +298,8 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
     <string name="message_discarded_toast">Nachricht wurde verworfen</string>
     <string name="message_saved_toast">Nachricht wurde als Entwurf gespeichert</string>
 
+    <string name="global_settings_flag_label">Wichtige Nachrichten</string>
+    <string name="global_settings_flag_summary">Sterne weisen auf wichtige Nachrichten hin.</string>
     <string name="global_settings_checkbox_label">Mehrfachauswahl</string>
     <string name="global_settings_checkbox_summary">Immer Mehrfachauswahl-Felder anzeigen</string>
     <string name="global_settings_preview_lines_label">Vorschauzeilen</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e50b7009d..92863b7c3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -293,6 +293,8 @@
     <string name="message_discarded_toast">Το μήνυμα αγνοήθηκε.</string>
     <string name="message_saved_toast">Το μήνυμα αποθηκεύτηκε στα πρόχειρα.</string>
 
+    <string name="global_settings_flag_label">Προβολή αστεριών</string>
+    <string name="global_settings_flag_summary">Τα αστέρια υποδηλώνουν σημαντικά μηνύματα</string>
     <string name="global_settings_checkbox_label">Κουτιά πολλαπλής επιλογής</string>
     <string name="global_settings_checkbox_summary">Προβολή κουτιών επιλογής πάντοτε</string>
     <string name="global_settings_preview_lines_label">Προεπισκόπηση μηνυμάτων</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 09c514615..ad753109f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -299,6 +299,8 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
 
     <string name="global_settings_checkbox_label">Casillas de selección múltiple</string>
     <string name="global_settings_checkbox_summary">Mostrar casillas de selección múltiple</string>
+    <string name="global_settings_flag_label">Ver estrellas</string>
+    <string name="global_settings_flag_summary">Las estrellas indican un mensaje destacado</string>
     <string name="global_settings_preview_lines_label">Previsualizar lineas</string>
     <string name="global_settings_show_correspondent_names_label">Mostrar nombre asociado</string>
     <string name="global_settings_show_correspondent_names_summary">Mostrar nombre asociado en vez de dirección de correo</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 368c03272..57424f5d8 100755
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -299,6 +299,8 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
     <string name="message_discarded_toast">Viesti peruutettu</string>
     <string name="message_saved_toast">Viesti tallennettu luonnoksena</string>
 
+    <string name="global_settings_flag_label">Viestin tähdet</string>
+    <string name="global_settings_flag_summary">Tähdet ilmaisevat merkityt viestit</string>
     <string name="global_settings_checkbox_label">Usean valinnan valintaruudut</string>
     <string name="global_settings_checkbox_summary">Näytä aina usean valinnan valintaruudut</string>
     <string name="global_settings_preview_lines_label">Rivien esikatselu</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 49773cd88..ae4903da2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -323,6 +323,8 @@ de plus</string>
     <string name="message_discarded_toast">Message abandonné</string>
     <string name="message_saved_toast">Message enregistré comme brouillon</string>
 
+    <string name="global_settings_flag_label">Étoiles des messages</string>
+    <string name="global_settings_flag_summary">Les étoiles indiquent des messages suivis</string>
     <string name="global_settings_checkbox_label">Cases à cocher</string>
     <string name="global_settings_checkbox_summary">Toujours afficher les cases à cocher</string>
     <string name="global_settings_preview_lines_label">Lignes dʼaperçu</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f462d2e9d..22a4fe229 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -297,6 +297,8 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
     <string name="message_discarded_toast">Mensaxes descartadas</string>
     <string name="message_saved_toast">Mensaxe guardada coma borrador</string>
 
+    <string name="global_settings_flag_label">Ver estrelas</string>
+    <string name="global_settings_flag_summary">As estrelas indican unha mensaxe destacada</string>
     <string name="global_settings_checkbox_label">Selección múltiple</string>
     <string name="global_settings_checkbox_summary">Permitir múltiple selección</string>
     <string name="global_settings_preview_lines_label">Previsualizar liñas</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 28eb05458..d19a7673d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -298,6 +298,8 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
     <string name="message_discarded_toast">Levél eldobva</string>
     <string name="message_saved_toast">Levél mentve a piszkozatokba</string>
 
+    <string name="global_settings_flag_label">Csillagok</string>
+    <string name="global_settings_flag_summary">Csillag jelzi a fontos leveleket</string>
     <string name="global_settings_checkbox_label">Többszörös kijelölés</string>
     <string name="global_settings_checkbox_summary">Kijelölő négyzetet a levelek mellet</string>
     <string name="global_settings_preview_lines_label">Előnézeti sorok száma</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0895b83fc..c8d5d79cb 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -298,6 +298,8 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
     <string name="message_discarded_toast">Messaggio scartato</string>
     <string name="message_saved_toast">Messaggio salvato come bozza</string>
 
+    <string name="global_settings_flag_label">Mostra stelle</string>
+    <string name="global_settings_flag_summary">Le stelle indicano i messaggi evidenziati</string>
     <string name="global_settings_checkbox_label">Caselle di selezione multipla</string>
     <string name="global_settings_checkbox_summary">Mostra sempre caselle di selezione multipla</string>
     <string name="global_settings_preview_lines_label">Righe di anteprima</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4223e33bf..40579864f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -298,6 +298,8 @@
     <string name="message_discarded_toast">ההודעה נמחקה</string>
     <string name="message_saved_toast">ההודעה נשמרה כטיוטה</string>
 
+    <string name="global_settings_flag_label">הצג כוכבים</string>
+    <string name="global_settings_flag_summary">הכוכבים מצביעים על ההודעות המסומנות</string>
     <string name="global_settings_checkbox_label">תיבות סימון בחירה-מרובה</string>
     <string name="global_settings_checkbox_summary">תמיד הצג תיבות סימון בחירה-מרובה</string>
     <string name="global_settings_preview_lines_label">קווי תצוגה מקדימה</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6271b2adb..5f2160f22 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -297,6 +297,8 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
     <string name="message_discarded_toast">メールを破棄しました</string>
     <string name="message_saved_toast">下書きに保存しました</string>
 
+    <string name="global_settings_flag_label">スターを表示</string>
+    <string name="global_settings_flag_summary">スターは印の付いたメッセージを示す</string>
     <string name="global_settings_checkbox_label">複数選択チェックボックス</string>
     <string name="global_settings_checkbox_summary">複数選択チェックボックス常時表示</string>
     <string name="global_settings_preview_lines_label">メッセージプレビューの行数</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index f2beeb9a1..63c838021 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -321,6 +321,8 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
     <string name="global_settings_messageview_return_to_list_summary">메시지 삭제 후에 메시지 목록으로 돌아갑니다</string>
     <string name="global_settings_messageview_show_next_label">삭제 후 다음 메시지 보기</string>
     <string name="global_settings_messageview_show_next_summary">메시지 삭제 후 다음 메시지를 보도록 기본값으로 설정합니다</string>
+    <string name="global_settings_flag_label">즐겨찾기 보기</string>
+    <string name="global_settings_flag_summary">체크된 메시지 즐겨찾기등록</string>
 
     <string name="global_settings_confirm_actions_title">동작시 행동</string>
     <string name="global_settings_confirm_actions_summary">설정한 행동을 할 경우 대화 상자를 보여 줍니다</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8b7db7af6..d0827bf83 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -297,6 +297,8 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
     <string name="message_discarded_toast">Bericht verwijderd</string>
     <string name="message_saved_toast">Bericht opgeslagen als concept</string>
 
+    <string name="global_settings_flag_label">Bericht sterren</string>
+    <string name="global_settings_flag_summary">Sterren geven gemarkeerde berichten aan</string>
     <string name="global_settings_checkbox_label">Multi-selecteer selectieboxen</string>
     <string name="global_settings_checkbox_summary">Laat altijd multi-selecteer selectieboxen zien</string>
     <string name="global_settings_preview_lines_label">Preview regels</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c4967bea2..410cfa1ba 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -303,6 +303,8 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
     <string name="message_discarded_toast">Wiadomość usunięta</string>
     <string name="message_saved_toast">Wiadomość zapisana jako szkic</string>
 
+    <string name="global_settings_flag_label">Oznaczaj gwiazdkami</string>
+    <string name="global_settings_flag_summary">Gwiazka wskazuje oznakowane wiadomości</string>
     <string name="global_settings_checkbox_label">Zaznaczanie wielu</string>
     <string name="global_settings_checkbox_summary">Opcja zaznaczania wielu wiadomości dostępna zawsze w trybie wielokrotnego wyboru</string>
     <string name="global_settings_preview_lines_label">Podglądaj linie</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 8cde88d8f..4ad8a2d0d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -294,6 +294,8 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
     <string name="message_discarded_toast">Mensagem descartada</string>
     <string name="message_saved_toast">Mensagem salva como rascunho</string>
 
+    <string name="global_settings_flag_label">Mostrar favoritos</string>
+    <string name="global_settings_flag_summary">Estrelas indicam mensagens favoritas</string>
     <string name="global_settings_checkbox_label">Caixas de multi-seleção</string>
     <string name="global_settings_checkbox_summary">Sempre mostrar caixas de multi-seleção</string>
     <string name="global_settings_preview_lines_label">Linhas de visualização</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b08967528..a05390a03 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -328,6 +328,8 @@ K-9 Mail — почтовый клиент для Android.
 
     <string name="global_settings_notification_hide_subject_title">Скрыть тему в уведомлении</string>
     <string name="global_settings_notification_hide_subject_never">Никогда</string>
+    <string name="global_settings_flag_label">Показывать звёзды</string>
+    <string name="global_settings_flag_summary">Звёзды указывают отмеченные сообщения</string>
     <string name="global_settings_notification_hide_subject_when_locked">При блокировке</string>
     <string name="global_settings_notification_hide_subject_always">Всегда</string>
 
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 271c0efcd..e4d27cefa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -298,6 +298,8 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
     <string name="message_discarded_toast">Brevet kasserat</string>
     <string name="message_saved_toast">Brevet sparat som utkast</string>
 
+    <string name="global_settings_flag_label">Stjärnor</string>
+    <string name="global_settings_flag_summary">Stjärnor indikerar flaggade brev</string>
     <string name="global_settings_checkbox_label">Checkboxar för flerval</string>
     <string name="global_settings_checkbox_summary">Visa alltid checkboxar för flerval</string>
     <string name="global_settings_preview_lines_label">Förhandsgranska rader</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 9091a08bf..e83262e26 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -298,6 +298,8 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
     <string name="message_discarded_toast">Mesaj silindi</string>
     <string name="message_saved_toast">Mesaj taslak olarak kaydedildi.</string>
 
+    <string name="global_settings_flag_label">Yıldızları Göster</string>
+    <string name="global_settings_flag_summary">Yıldızlar bayraklı mesajları gösterir.</string>
     <string name="global_settings_checkbox_label">Çoklu-seçim işaret kutuları</string>
     <string name="global_settings_checkbox_summary">Çoklu-seçim işaret kutularını Daima göster.</string>
     <string name="global_settings_preview_lines_label">Önizleme hatları</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b3e2723b7..b43ae62f3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -298,6 +298,8 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
     <string name="message_discarded_toast">Повідомлення скасовано</string>
     <string name="message_saved_toast">Повідомлення збережено як чернетка</string>
 
+    <string name="global_settings_flag_label">Показувати зірочки</string>
+    <string name="global_settings_flag_summary">Зірочки показують відмічені повідомлення</string>
     <string name="global_settings_checkbox_label">Прапорці для множинного вибору</string>
     <string name="global_settings_checkbox_summary">Завжди показувати прапорці множинного вибору</string>
     <string name="global_settings_preview_lines_label">Рядки попереднього перегляду</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1665c206a..abe220f57 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -291,6 +291,8 @@ K-9改进的功能包括：
     <string name="message_discarded_toast">邮件已忽略</string>
     <string name="message_saved_toast">邮件已保存为草稿</string>
 
+    <string name="global_settings_flag_label">显示星标</string>
+    <string name="global_settings_flag_summary">星标指示标记过的邮件</string>
     <string name="global_settings_checkbox_label">复选框</string>
     <string name="global_settings_checkbox_summary">总是显示多选框</string>
     <string name="global_settings_preview_lines_label">预览行数</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f73c2bc5b..53f535cb4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -267,6 +267,8 @@
     <string name="message_discarded_toast">郵件已忽略</string>
     <string name="message_saved_toast">郵件已儲存為草稿</string>
 
+    <string name="global_settings_flag_label">顯示星號</string>
+    <string name="global_settings_flag_summary">顯示標記過星號的郵件</string>
     <string name="global_settings_checkbox_label">多選核取方塊</string>
     <string name="global_settings_checkbox_summary">預設顯示多選核取方塊</string>
     <string name="global_settings_preview_lines_label">預覽行數</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8a1cf523b..5d92b2860 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -303,6 +303,8 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="message_discarded_toast">Message discarded</string>
     <string name="message_saved_toast">Message saved as draft</string>
 
+    <string name="global_settings_flag_label">Show stars</string>
+    <string name="global_settings_flag_summary">Stars indicate flagged messages</string>
     <string name="global_settings_checkbox_label">Multi-select checkboxes</string>
     <string name="global_settings_checkbox_summary">Always show multi-select checkboxes</string>
     <string name="global_settings_preview_lines_label">Preview lines</string>