moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Added account settings for "archive" and "spam" folders. See issue 3.

This commit is contained in:
Thialfihar 2010-07-04 13:48:06 +00:00
parent 5c3f366661
commit 03b28c8b68
8 changed files with 318 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
res/layout/account_setup_incoming.xml
View File

@ -8,7 +8,7 @@
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="54dip"
android:layout_marginBottom="54dip"
android:padding="6dip"
android:fadingEdge="none"
android:scrollbarStyle="outsideInset">
@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent" />
<TextView
android:id="@+id/account_auth_type_label"
android:text="@string/account_setup_incoming_authtype_label"
android:layout_height="wrap_content"
@ -110,6 +110,11 @@
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/imap_folder_setup_section"
android:orientation="vertical">
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_archive"
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_archive" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_drafts"
android:layout_width="fill_parent"></TextView>
@ -120,6 +125,11 @@
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_sent" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_spam"
android:layout_width="fill_parent"></TextView>
<Button android:layout_height="wrap_content"
android:id="@+id/account_imap_folder_spam" android:layout_width="fill_parent"></Button>
<TextView android:layout_height="wrap_content"
android:text="@string/account_setup_incoming_imap_folder_trash"
android:layout_width="fill_parent"></TextView>
@ -139,7 +149,7 @@
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_subscribed_folders_only_label"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/webdav_path_prefix_section"
@ -202,12 +212,12 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox
android:id="@+id/compression_mobile"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_mobile_label"
/>
<CheckBox
android:id="@+id/compression_mobile"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_mobile_label"
/>
<CheckBox
android:id="@+id/compression_wifi"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@ -227,10 +237,10 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" />
<CheckBox
android:id="@+id/save_all_headers"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_save_all_headers_label" />
android:id="@+id/save_all_headers"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/account_setup_incoming_save_all_headers_label" />
<LinearLayout
android:id="@+id/push_poll_on_connect_section"
android:layout_width="fill_parent"
@ -242,12 +252,12 @@
android:layout_width="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary" />
<CheckBox
android:id="@+id/push_poll_on_connect"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:label="foo"
/>
<CheckBox
android:id="@+id/push_poll_on_connect"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:label="foo"
/>
</LinearLayout>
<TextView
android:id="@+id/idle_refresh_period_label"
@ -273,7 +283,7 @@
android:layout_height="wrap_content"
android:layout_width="fill_parent"
/>
<View
android:layout_width="fill_parent"
android:layout_height="0dip"

152
res/values-de/strings.xml
View File

@ -24,7 +24,7 @@
<string name="choose_color_title">Farbe wählen</string>
<string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
<string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
<string name="status_loading_account_folder">\u0020(Lade <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_sending_account">\u0020(Sende <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@ -45,6 +45,7 @@
<string name="reply_all_action">Allen antworten</string>
<string name="delete_action">Löschen</string>
<string name="archive_action">Sichern</string>
<string name="spam_action">Spam</string>
<string name="delete_all_action">Ordner leeren</string>
<string name="forward_action">Weiterleiten</string>
<string name="move_action">Verschieben</string>
@ -70,7 +71,7 @@
<string name="folder_settings_action">Ordnereinstellungen</string>
<string name="remove_account_action">Konto entfernen</string>
<string name="clear_pending_action">Ausstehende Aktionen abbrechen (Warnung!)</string>
<string name="accounts_action">Konten</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -78,14 +79,14 @@
<string name="mark_as_read_action">Als gelesen markieren</string>
<string name="send_alternate_action">Weiterleiten (Alternativ)</string>
<string name="send_alternate_chooser_title">Absender auswählen</string>
<string name="mark_all_as_read_dlg_title">Alle Nachrichten als gelesen markieren</string>
<string name="mark_all_as_read_dlg_instructions_fmt">Alle Nachrichten in \'<xliff:g id="folder">%s</xliff:g>\' als gelesen markieren? (inklusive Nachrichten in diesem Ordner, die nicht von K-9 dargestellt werden)</string>
<string name="flag_action">Als wichtig markieren</string>
<string name="unflag_action">Wichtig-Markierung entfernen</string>
<string name="copy_action">Kopieren</string>
<string name="mark_as_unread_action">Als ungelesen markieren</string>
<string name="move_to_action">Verschiebe nach</string>
<string name="folders_action">Ordner</string>
@ -121,20 +122,20 @@
<string name="load_more_messages_fmt">Bis zu
<xliff:g id="messages_to_load">%d</xliff:g> weitere abrufen</string>
<string name="abbrev_gigabytes">GB</string>
<string name="abbrev_megabytes">MB</string>
<string name="abbrev_kilobytes">KB</string>
<string name="abbrev_bytes">B</string>
<string name="account_size_changed">
Konto \"<xliff:g id="account">%s</xliff:g>\" von
<xliff:g id="oldSize">%s</xliff:g>
auf
<xliff:g id="newSize">%s</xliff:g>
komprimiert
komprimiert
</string>
<string name="compacting_account">Komprimiere Konto \"<xliff:g id="account">%s</xliff:g>\"</string>
<string name="clearing_account">Bereinige Konto \"<xliff:g id="account">%s</xliff:g>\"</string>
@ -157,24 +158,28 @@
<string name="special_mailbox_name_drafts">Entwürfe</string>
<string name="special_mailbox_name_trash">Papierkorb</string>
<string name="special_mailbox_name_sent">Gesendet</string>
<string name="special_mailbox_name_archive">Archiv</string>
<string name="special_mailbox_name_spam">Spam</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Postausgang)</string>
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Entwürfe)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Papierkorb)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Gesendet)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archiv)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
<string name="send_failure_subject">Fehler beim Senden von Nachrichten</string>
<string name="send_failure_body_abbrev">Sehen Sie bitte im Ordner <xliff:g id="errorFolder">%s</xliff:g> für Details nach.</string>
<string name="send_failure_body_fmt">K-9 hat beim Senden einiger Ihrer Nachrichten ein Problem festgestellt.
Hierbei kann K-9 aber nicht feststellen, ob die Nachricht gesendet wurde oder nicht. Die Empfänger haben möglicherweise schon Kopien der Nachricht erhalten.
\u000a\u000aDie Nachrichten, bei denen dieses Problem auftrat, sind in ihrem Postausgang markiert. Wenn Sie die Markierung entfernen, wird K-9 versuchen die Nachricht erneut zu versenden.
Durch langes Drücken auf den Postausgang erscheint ein Menü, bei dem mit "Nachricht senden" ein erneuter Sendeversuch gestartet werden kann.\u000A\u000a
Der Ordner <xliff:g id="errorFolder">%s</xliff:g> enthält möglicherweise Fehlermeldungen mit Details zu diesem Problem.</string>
Durch langes Drücken auf den Postausgang erscheint ein Menü, bei dem mit "Nachricht senden" ein erneuter Sendeversuch gestartet werden kann.\u000A\u000a
Der Ordner <xliff:g id="errorFolder">%s</xliff:g> enthält möglicherweise Fehlermeldungen mit Details zu diesem Problem.</string>
<string name="alert_header">K-9-Alarm</string>
<string name="no_connection_alert">Synchronisierung und Senden von Nachrichten aufgrund von fehlender Netzwerkverbindung eingestellt.</string>
<string name="end_of_folder">Keine weiteren Nachrichten</string>
<string name="accounts_welcome">
@ -237,7 +242,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="message_compose_error_no_recipients">Sie müssen mindestens einen Empfänger wählen.</string>
<string name="message_compose_downloading_attachments_toast">Einige Anlagen wurden nicht heruntergeladen. Sie werden automatisch heruntergeladen, bevor diese Nachricht gesendet wird.</string>
<string name="message_compose_attachments_skipped_toast">Einige Anlagen können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>
<string name="message_view_from_format">Von: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_view_to_label">An:</string>
<string name="message_view_cc_label">CC:</string>
@ -245,6 +250,9 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="message_view_attachment_download_action">Speichern</string>
<string name="message_view_prev_action">\u25BC</string>
<string name="message_view_next_action">\u25B2</string>
<string name="message_view_archive_action">Sichern</string>
<string name="message_view_move_action">Verschieben</string>
<string name="message_view_spam_action">Spam</string>
<string name="message_view_datetime_fmt">dd. MMM yyyy HH:mm</string>
<string name="message_view_status_attachment_saved">Anlage auf SD-Karte gespeichert als <xliff:g id="filename">%s</xliff:g>.</string>
<string name="message_view_status_attachment_not_saved">Anlage konnte nicht auf SD-Karte gespeichert werden.</string>
@ -257,7 +265,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="mailbox_select_dlg_new_mailbox_action">Neuer Ordner</string>
<string name="new_mailbox_dlg_title">Neuer Ordnername</string>
<string name="folder_push_active_symbol">(Laden)</string>
<string name="message_copied_toast">Nachricht kopiert.</string>
@ -320,18 +328,18 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_incoming_security_ssl_label">SSL (immer)</string>
<string name="account_setup_incoming_security_tls_optional_label">TLS (falls verfügbar)</string>
<string name="account_setup_incoming_security_tls_label">TLS (immer)</string>
<string name="account_setup_incoming_delete_policy_label">Aktion bei Löschen von Nachrichten:</string>
<string name="account_setup_incoming_delete_policy_never_label">Nie von Server löschen</string>
<string name="account_setup_incoming_delete_policy_7days_label">Nach 7 Tagen löschen</string>
<string name="account_setup_incoming_delete_policy_delete_label">Auch auf Server löschen</string>
<string name="account_setup_incoming_delete_policy_markread_label">Auf Server als gelesen markieren</string>
<string name="account_setup_incoming_compression_label">Komprimierung bei Netzwerk verwenden:</string>
<string name="account_setup_incoming_mobile_label">Mobil</string>
<string name="account_setup_incoming_wifi_label">WLAN</string>
<string name="account_setup_incoming_other_label">Anderes</string>
<string name="account_setup_expunge_policy_label">Ordner bereinigen (Expunge)</string>
<string name="account_setup_expunge_policy_immediately">Sofort nach Verschieben oder Kopieren</string>
<string name="account_setup_expunge_policy_on_poll">Bei jedem Abrufen</string>
@ -339,14 +347,16 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_incoming_imap_path_prefix_label">IMAP-Verzeichnispräfix</string>
<string name="account_setup_incoming_imap_path_prefix_hint">(Automatisch mit Hilfe von NAMESPACE falls verfügbar)</string>
<string name="account_setup_incoming_imap_folder_drafts">Ordner für Entwürfe</string>
<string name="account_setup_incoming_imap_folder_sent">Ordner für gesendete Objekte</string>
<string name="account_setup_incoming_imap_folder_trash">Ordner für gelöschte Objekte</string>
<string name="account_setup_incoming_imap_folder_archive">Ordner für archivierte Objekte</string>
<string name="account_setup_incoming_imap_folder_spam">Ordner für Spam</string>
<string name="account_setup_incoming_imap_folder_outbox">Ordner für ausgehende Objekte</string>
<string name="account_setup_auto_expand_folder">Autom. Startordner</string>
<string name="account_setup_incoming_webdav_path_prefix_label">WebDAV(Exchange)-Pfad</string>
<string name="account_setup_incoming_webdav_path_prefix_hint">Optional</string>
@ -375,10 +385,10 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP vor SMTP</string>
<string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV(Exchange) vor SMTP</string>
<string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
<string name="account_setup_bad_uri">Ungültige Einstellung: <xliff:g id="err_mess">%s</xliff:g></string>
<string name="account_setup_options_title">Kontoeinstellungen</string>
<string name="compact_action">Komprimieren</string>
<string name="clear_action">Alle Daten löschen (Achtung!)</string>
@ -396,7 +406,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_options_mail_check_frequency_6hour">Alle 6 Stunden</string>
<string name="account_setup_options_mail_check_frequency_12hour">Alle 12 Stunden</string>
<string name="account_setup_options_mail_check_frequency_24hour">Alle 24 Stunden</string>
<string name="account_setup_options_enable_push_label">Push-Mail für dieses Konto aktivieren</string>
<string name="account_setup_options_enable_push_summary">Neue Nachrichten werden nach dem Eintreffen umgehend abgerufen, falls Ihr Server dies unterstützt. Diese Einstellung kann zur Reduzierung der Laufzeit führen oder diese verbessern.</string>
@ -413,7 +423,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_options_mail_display_count_250">250 Nachrichten</string>
<string name="account_setup_options_mail_display_count_500">500 Nachrichten</string>
<string name="account_setup_options_mail_display_count_1000">1000 Nachrichten</string>
<string name="move_copy_cannot_copy_unsynced_message">Nachrichten, die nicht mit dem Server synchronisiert wurden, können nicht kopiert oder verschoben werden.</string>
<string name="account_setup_failed_dlg_title">Setup konnte nicht abgeschlossen werden</string>
@ -435,54 +445,54 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_show_combined_label">Globalen Posteingang anzeigen</string>
<string name="account_settings_notify_self_label">Benachr. für eigene Nachrichten</string>
<string name="account_settings_notify_self_summary">Benachrichtigungen für Nachrichten, die eine ihrer eigenen E-Mail-Adressen als Absender tragen.</string>
<string name="account_settings_hide_buttons_label">Navigations-Scrollbuttons</string>
<string name="account_settings_hide_buttons_never">Nie</string>
<string name="account_settings_hide_buttons_keyboard_avail">Nur wenn Tastatur aktiv</string>
<string name="account_settings_hide_buttons_always">Immer</string>
<string name="account_settings_composition">Nachricht verfassen</string>
<string name="account_settings_sync">Ordner synchronisieren</string>
<string name="account_settings_sync">Ordner synchronisieren</string>
<string name="account_settings_folders">Ordner</string>
<string name="account_settings_message_lists">Liste der Nachrichten</string>
<string name="account_settings_message_view">Anzeige der Nachricht</string>
<string name="account_settings_message_lists">Liste der Nachrichten</string>
<string name="account_settings_message_view">Anzeige der Nachricht</string>
<string name="account_settings_mail_check_frequency_label">Häufigkeit der E-Mail-Abfrage</string>
<string name="account_settings_second_class_check_frequency_label">Häufigkeit der Abfrage für Nebenordner</string>
<string name="account_settings_color_label">Farbe des Kontos</string>
<string name="account_settings_color_summary">Wählen Sie die Farbe, in der das Konto in der Konten- und Ordnerliste dargestellt wird</string>
<string name="account_settings_mail_display_count_label">Anzahl anzuzeigender Nachrichten</string>
<string name="account_settings_folder_display_mode_label">Ordner anzeigen</string>
<string name="account_settings_folder_display_mode_all">Alle</string>
<string name="account_settings_folder_display_mode_first_class">Nur Hauptordner</string>
<string name="account_settings_folder_display_mode_first_and_second_class">Haupt- und Nebenordner</string>
<string name="account_settings_folder_display_mode_not_second_class">Alle außer Nebenordner</string>
<string name="account_settings_folder_sync_mode_label">Abzufragende Ordner</string>
<string name="account_settings_folder_sync_mode_all">Alle</string>
<string name="account_settings_folder_sync_mode_first_class">Nur Hauptordner</string>
<string name="account_settings_folder_sync_mode_first_and_second_class">Haupt- und Nebenordner</string>
<string name="account_settings_folder_sync_mode_not_second_class">Alle außer Nebenordner</string>
<string name="account_settings_folder_sync_mode_none">Keine</string>
<string name="account_settings_folder_push_mode_label">Ordner per Push abfragen</string>
<string name="account_settings_folder_push_mode_all">Alle</string>
<string name="account_settings_folder_push_mode_first_class">Nur Hauptordner</string>
<string name="account_settings_folder_push_mode_first_and_second_class">Haupt- und Nebenordner</string>
<string name="account_settings_folder_push_mode_not_second_class">Alle außer Nebenordner</string>
<string name="account_settings_folder_push_mode_none">Keine</string>
<string name="account_settings_folder_target_mode_label">Zielordner für Kopieren/Verschieben</string>
<string name="account_settings_folder_target_mode_all">Alle</string>
<string name="account_settings_folder_target_mode_first_class">Nur Hauptordner</string>
<string name="account_settings_folder_target_mode_first_and_second_class">Haupt- und Nebenordner</string>
<string name="account_settings_folder_target_mode_not_second_class">Alle außer Nebenordner</string>
<string name="folder_settings_title">Ordner-Einstellungen</string>
<string name="folder_settings_in_top_group_label">Gruppe \'Oben anzeigen\'</string>
<string name="folder_settings_in_top_group_summary">Oben in der Ordnerliste anzeigen</string>
@ -490,19 +500,19 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="folder_settings_folder_display_mode_normal">Keine</string>
<string name="folder_settings_folder_display_mode_first_class">Hauptordner</string>
<string name="folder_settings_folder_display_mode_second_class">Nebenordner</string>
<string name="folder_settings_folder_sync_mode_label">Synchronisationsklasse</string>
<string name="folder_settings_folder_sync_mode_normal">Keine</string>
<string name="folder_settings_folder_sync_mode_first_class">Hauptordner</string>
<string name="folder_settings_folder_sync_mode_second_class">Nebenordner</string>
<string name="folder_settings_folder_sync_mode_inherited">Wie Anzeigeklasse</string>
<string name="folder_settings_folder_push_mode_label">Push-Klasse</string>
<string name="folder_settings_folder_push_mode_normal">Keine</string>
<string name="folder_settings_folder_push_mode_first_class">Hauptordner</string>
<string name="folder_settings_folder_push_mode_second_class">Nebenordner</string>
<string name="folder_settings_folder_push_mode_inherited">Wie Synchronisationsklasse</string>
<string name="account_settings_incoming_label">Einstellungen Posteingang</string>
<string name="account_settings_incoming_summary">Einstellungen für Posteingangsserver bearbeiten.</string>
<string name="account_settings_outgoing_label">Einstellungen Postausgang</string>
@ -529,16 +539,16 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="manage_identities_context_menu_title">Identität berarbeiten</string>
<string name="edit_identity_title">Identität bearbeiten</string>
<string name="new_identity_action">Neue Identität erstellen</string>
<string name="new_identity_action">Neue Identität erstellen</string>
<string name="account_settings_always_bcc_label">Alle Nachrichten mit BCC an</string>
<string name="account_settings_always_bcc_summary">Dieser Adresse eine Kopie aller ausgehenden Nachrichten zustellen</string>
<string name="manage_identities_edit_action">Bearbeiten</string>
<string name="manage_identities_move_up_action">Nach oben verschieben</string>
<string name="manage_identities_move_down_action">Nach unten verschieben</string>
<string name="manage_identities_move_top_action">Ganz nach oben / Standard</string>
<string name="manage_identities_remove_action">Entfernen</string>
<string name="manage_identities_edit_action">Bearbeiten</string>
<string name="manage_identities_move_up_action">Nach oben verschieben</string>
<string name="manage_identities_move_down_action">Nach unten verschieben</string>
<string name="manage_identities_move_top_action">Ganz nach oben / Standard</string>
<string name="manage_identities_remove_action">Entfernen</string>
<string name="edit_identity_description_label">Name der Identität</string>
<string name="edit_identity_description_hint">(Optional)</string>
@ -552,7 +562,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_signature_use_label">Signatur verwenden</string>
<string name="account_settings_signature_label">Signatur</string>
<string name="account_settings_signature_summary">Signatur an jede Nachricht anfügen</string>
<string name="default_signature">-- \nDiese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.</string>
<string name="default_identity_description">Standard-Identität</string>
<string name="choose_identity">Identität auswählen</string>
@ -562,7 +572,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="no_removable_identity">Sie können Ihre einzige Identität nicht löschen</string>
<string name="identity_has_no_email">Sie können keine Identität ohne E-Mail-Adresse verwenden</string>
<string name="identity_will_not_be_saved">Die Wahl Ihrer Identität und Änderungen an der Signatur werden bei einem Entwurf nicht gespeichert</string>
<string name="sort_earliest_first">Älteste Nachrichten zuerst</string>
<string name="sort_latest_first">Neueste Nachrichten zuerst</string>
<string name="sort_sender_alpha">Alphabetisch nach Absender</string>
@ -575,7 +585,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="sort_unread_last">Gelesene Nachrichten zuerst</string>
<string name="sort_attach_first">Nachrichten mit Anlagen zuerst</string>
<string name="sort_unattached_first">Nachrichten ohne Anlagen zuerst</string>
<string name="sort_by">Sortieren nach...</string>
<string name="sort_by_date">Datum</string>
<string name="sort_by_sender">Absender</string>
@ -594,19 +604,19 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
der richtigen E-Mail-Adresse und dem richtigen Kennwort anmelden können, haben Sie möglicherweise die Gebühren für das
\"Plus\"-Konto nicht bezahlt. Starten Sie den Webbrowser, um auf
diese Mailkonten zuzugreifen.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Ungültiges Zertifikat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Zertifikat akzeptieren</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Zertifikat ablehnen</string>
<string name="message_help_key">Del (or D) - Löschen\u000AR -
Antworten\u000AA - Allen antworten\u000AF - Weiterleiten\u000AJ or P - Vorherige
Nachricht\u000AK, N - Nächste Nachricht\u000AM - Verschieben\u000AY - Kopieren\u000AZ - Heraus-Zoomen\u000AShift-Z -
Antworten\u000AA - Allen antworten\u000AF - Weiterleiten\u000AJ or P - Vorherige
Nachricht\u000AK, N - Nächste Nachricht\u000AM - Verschieben\u000AY - Kopieren\u000AZ - Heraus-Zoomen\u000AShift-Z -
Hinein-Zoomen\u000aG - Markieren</string>
<string name="message_list_help_key">Del (or D) - Löschen\u000AR -
Antworten\u000AA - Allen Antworten\u000AC - Verfassen\u000AF - Weiterleiten\u000aM - Verschieben\u000AY - Kopieren\u000AG - Markieren\u000AO - Sortierung\u000AI - Sortierungsreihenfolge\u000AQ
- zurück zu den Konten\u000AS - Auswählen/abwählen</string>
<string name="folder_list_help_key">
1 - Nur Hauptordner anzeigen\u000A
2 - Haupt- und Nebenordner anzeigen\u000A
@ -615,13 +625,13 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
Q - Zurück zu den Konten\u000A
S - Kontoeinstellungen bearbeiten
</string>
<string name="folder_list_display_mode_label">Ordner</string>
<string name="folder_list_display_mode_all">Alle Ordner anzeigen</string>
<string name="folder_list_display_mode_first_class">Nur Hauptordner anzeigen</string>
<string name="folder_list_display_mode_first_and_second_class">Haupt- und Nebenordner anzeigen</string>
<string name="folder_list_display_mode_not_second_class">Alle außer Nebenordner anzeigen</string>
<string name="account_settings_signature__location_label">Position der Signatur</string>
<string name="account_settings_signature__location_before_quoted_text">Vor zitierter Nachricht</string>
<string name="account_settings_signature__location_after_quoted_text">Nach zitierter Nachricht</string>
@ -633,14 +643,14 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="accountlist_preferences">Liste der Konten</string>
<string name="messagelist_preferences">Liste der Nachrichten</string>
<string name="settings_theme_label">Theme</string>
<string name="background_ops_label">Hintergrund-Synchronisierung</string>
<string name="background_ops_never">Nie</string>
<string name="background_ops_always">Immer</string>
<string name="background_ops_enabled">Wenn \'Hintergrunddaten\' aktiviert ist</string>
<string name="no_message_seletected_toast">Keine Nachricht ausgewählt</string>
<string name="date_format_label">Datumsformat</string>
<!--
The values of the date_format_* strings MUST be valid date format strings.
@ -650,7 +660,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd.MMM yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string>
<string name="batch_ops">Mehrfachauswahl</string>
<string name="batch_delete_op">Ausgewählte löschen</string>
<string name="batch_mark_read_op">Ausgewählte als gelesen markieren</string>
@ -664,7 +674,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="batch_plain_mode">Normaler Modus</string>
<string name="batch_select_all">Alle auswählen</string>
<string name="batch_deselect_all">Alle abwählen</string>
<string name="account_setup_push_limit_label">Max. Ordner mit Push abrufen</string>
<string name="account_setup_push_limit_10">10 Ordner</string>
<string name="account_setup_push_limit_25">25 Ordner</string>
@ -673,34 +683,34 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_push_limit_250">250 Ordner</string>
<string name="account_setup_push_limit_500">500 Ordner</string>
<string name="account_setup_push_limit_1000">1000 Ordner</string>
<string name="animations_title">Animationen</string>
<string name="animations_summary">Aufwändige visuelle Effekte benutzen</string>
<string name="gestures_title">Gesten zulassen</string>
<string name="gestures_summary">Gesten für vorherige/nächste Nachricht aktivieren</string>
<string name="measure_accounts_title">Konto-Größe anzeigen</string>
<string name="measure_accounts_summary">Deaktivieren für schnellere Anzeige</string>
<string name="count_search_title">Suchergebnisse zählen</string>
<string name="count_search_summary">Deaktivieren für schnellere Anzeige</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
<string name="flagged_modifier"> - Wichtig</string>
<string name="unread_modifier"> - Ungelesen</string>
<string name="search_all_messages_title">Alle Nachrichten</string>
<string name="search_all_messages_detail">Alle Nachrichten in durchsuchbaren Ordnern</string>
<string name="integrated_inbox_title">Gemeinsamer Posteingang</string>
<string name="integrated_inbox_detail">Alle Nachrichten aus integrierten Ordnern</string>
<string name="tap_hint">Umschlag oder Stern anklicken für ungelesene oder wichtige Nachrichten</string>
<string name="folder_settings_include_in_integrated_inbox_label">Integration in gemeinsamen Posteingang</string>
<string name="folder_settings_include_in_integrated_inbox_summary">Ungelesene Nachrichten im gemeinsamen Posteingang anzeigen</string>
<string name="account_settings_searchable_label">Zu durchsuchende Ordner</string>
<string name="account_settings_searchable_all">Alle</string>
<string name="account_settings_searchable_displayable">Angezeigte</string>
@ -750,13 +760,13 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
<string name="message_compose_buggy_gallery">Wählen Sie \"Einstellungen\" -&gt; \"Galerie Work-Around aktivieren\" um Bilder oder Videos mithilfe der 3D-Galerie hinzufügen zu können.</string>
<!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
<string name="message_compose_use_workaround">Verwenden Sie \"Anlage hinzufügen (Bild)\" oder \"Anlage hinzufügen (Video)\" um Bilder oder Videos mit der 3D-Galerie hinzuzufügen.</string>
<string name="miscellaneous_preferences">Verschiedenes</string>
<string name="misc_preferences_attachment_title">Galerie Work-Around aktivieren</string>
<string name="misc_preferences_attachment_description">Schaltflächen zum Hinzufügen von Bild- und Video-Anhängen anzeigen (um Fehler in 3D-Galerie zu umgehen)</string>
</resources>

213
res/values/strings.xml
View File

@ -10,21 +10,21 @@
<string name="read_attachment_label">read Email attachments</string>
<string name="read_attachment_desc">Allows this application to read your Email attachments.</string>
<string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="accounts_title">Accounts</string>
<string name="advanced">Advanced</string>
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
<string name="accounts_title">Accounts</string>
<string name="advanced">Advanced</string>
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
<string name="compose_title">Compose</string>
<string name="debug_title">Debug</string>
<string name="choose_folder_title">Choose Folder</string>
<string name="choose_color_title">Choose a Color</string>
<string name="activity_header_format"><xliff:g id="activity_prefix">%s</xliff:g><xliff:g id="unread_count">%s</xliff:g><xliff:g id="operation">%s</xliff:g></string>
<string name="activity_unread_count">\u0020[<xliff:g id="unread_count">%d</xliff:g>]</string>
<string name="status_loading_account_folder">\u0020(Poll <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
<string name="status_sending_account">\u0020(Sending <xliff:g id="account">%s</xliff:g><xliff:g id="progress">%s</xliff:g>)</string>
@ -59,7 +59,7 @@
<string name="send_messages_action">Send messages</string>
<string name="list_folders_action">Folder list</string>
<string name="refresh_folders_action">Refresh folders</string>
<string name="mark_all_as_read_action">Mark all messages as read</string>
<string name="mark_all_as_read_action">Mark all messages as read</string>
<string name="add_account_action">Add account</string>
<string name="compose_action">Compose</string>
<string name="search_action">Search</string>
@ -70,9 +70,9 @@
<string name="folder_settings_action">Folder settings</string>
<string name="remove_account_action">Remove account</string>
<string name="clear_pending_action">Clear pending actions (danger!)</string>
<string name="accounts_action">Accounts</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -80,11 +80,11 @@
<string name="mark_as_read_action">Mark as read</string>
<string name="send_alternate_action">Forward with another app</string>
<string name="send_alternate_chooser_title">Choose sender</string>
<string name="mark_all_as_read_dlg_title">Mark all messages as read</string>
<string name="mark_all_as_read_dlg_instructions_fmt">Mark all messages in \'<xliff:g id="folder">%s</xliff:g>\' as read? (including
messages in the folder that are not displayed in K-9)</string>
<string name="flag_action">Add star</string>
<string name="unflag_action">Remove star</string>
<string name="copy_action">Copy</string>
@ -126,19 +126,19 @@
<string name="load_more_messages_fmt">Load up
to <xliff:g id="messages_to_load">%d</xliff:g> more</string>
<string name="abbrev_gigabytes">GB</string>
<string name="abbrev_megabytes">MB</string>
<string name="abbrev_kilobytes">KB</string>
<string name="abbrev_bytes">B</string>
<string name="account_size_changed">
Account \"<xliff:g id="account">%s</xliff:g>\" shrunk from
Account \"<xliff:g id="account">%s</xliff:g>\" shrunk from
<xliff:g id="oldSize">%s</xliff:g>
to
<xliff:g id="newSize">%s</xliff:g>
</string>
<string name="compacting_account">Compacting account \"<xliff:g id="account">%s</xliff:g>\"</string>
<string name="clearing_account">Clearing account \"<xliff:g id="account">%s</xliff:g>\"</string>
<string name="recreating_account">Recreating account \"<xliff:g id="account">%s</xliff:g>\"</string>
@ -162,32 +162,36 @@
<string name="special_mailbox_name_drafts">Drafts</string>
<string name="special_mailbox_name_trash">Trash</string>
<string name="special_mailbox_name_sent">Sent</string>
<string name="special_mailbox_name_archive">Archive</string>
<string name="special_mailbox_name_spam">Spam</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_outbox_fmt"><xliff:g id="folder">%s</xliff:g> (Outbox)</string>
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (Drafts)</string>
<string name="special_mailbox_name_trash_fmt"><xliff:g id="folder">%s</xliff:g> (Trash)</string>
<string name="special_mailbox_name_sent_fmt"><xliff:g id="folder">%s</xliff:g> (Sent)</string>
<string name="special_mailbox_name_archive_fmt"><xliff:g id="folder">%s</xliff:g> (Archive)</string>
<string name="special_mailbox_name_spam_fmt"><xliff:g id="folder">%s</xliff:g> (Spam)</string>
<string name="send_failure_subject">Failed to send some messages</string>
<string name="send_failure_body_abbrev">See your <xliff:g id="errorFolder">%s</xliff:g> folder for details.</string>
<string name="send_failure_body_fmt">K-9 encountered a problem sending some of your messages.
<string name="send_failure_body_fmt">K-9 encountered a problem sending some of your messages.
However, due to the nature of the problem, K-9 cannot be certain if the messages
were sent or not. The recipients may have already received copies of the message.
\u000a\u000aThe messages for which this type of problem occurred are now starred in your Outbox.
were sent or not. The recipients may have already received copies of the message.
\u000a\u000aThe messages for which this type of problem occurred are now starred in your Outbox.
If you remove the stars, K-9 will try to send the messages again.
Long-press the Outbox to find the \"Send messages\" action in order to initiate another sending attempt.\u000A\u000a
The <xliff:g id="errorFolder">%s</xliff:g> folder may contain error messages regarding the failures.</string>
<string name="alert_header">K-9 alert</string>
<string name="no_connection_alert">Syncing and sending suspended due to lack of network.</string>
<string name="end_of_folder">No more messages</string>
<string name="accounts_welcome">
Welcome to K-9 Mail setup. K-9 is an open source mail client for Android originally based on the standard Android Mail client.
\n
\n\nK-9\'s improved features include:
\n\nK-9\'s improved features include:
\n * Push mail using IMAP IDLE
\n * Better performance
\n * Message refiling
@ -197,7 +201,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
\n * All folder synchronization
\n * Return-address configuration
\n * Keyboard shortcuts
\n * Better IMAP support
\n * Better IMAP support
\n * Saving attachments to SD
\n * Empty Trash
\n * Message sorting
@ -206,7 +210,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
\nPlease note that K-9 does not support most free hotmail accounts and, like many mail clients, has some quirks when talking to Microsoft Exchange.
\n
\n Please submit bug reports, contribute new features and ask questions at http://k9mail.googlecode.com/
</string>
<string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
@ -246,8 +250,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="message_compose_downloading_attachments_toast">Some attachments were not downloaded. They will be downloaded automatically before this message is sent.</string>
<string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not been downloaded.</string>
<string name="message_view_from_format">From: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_view_to_label">To:</string>
<string name="message_view_cc_label">Cc:</string>
@ -262,17 +266,17 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="message_view_show_pictures_action">Show pictures</string>
<string name="message_view_fetching_attachment_toast">Fetching attachment.</string>
<string name="message_view_no_viewer">Unable to find viewer for <xliff:g id="mimetype">%s</xliff:g>.</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
<string name="message_additional_headers_not_downloaded">Not all headers have been downloaded or saved. Select \"Save all headers locally\" in the account\'s incoming server settings to enable this for the future.</string>
<string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>
<string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>
<string name="message_no_additional_headers_available">All headers have been downloaded, but there are no additional headers to show.</string>
<string name="message_additional_headers_retrieval_failed">The retrieval of additional headers from the database or mail server failed.</string>
<string name="mailbox_select_dlg_title">Folders</string>
<string name="mailbox_select_dlg_new_mailbox_action">New folder</string>
<string name="new_mailbox_dlg_title">New folder name</string>
<string name="folder_push_active_symbol">(Push)</string>
<string name="find_action">Find messages</string>
@ -285,8 +289,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="message_saved_toast">Message saved as draft</string>
<string name="message_delete_failed">Message could not be deleted</string>
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Message stars</string>
@ -301,7 +305,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="global_settings_messageview_return_to_list_label">Return to list after delete</string>
<string name="global_settings_messageview_return_to_list_summary">Return to message list after message deletion</string>
<string name="account_setup_basics_title">Set up a new account</string>
<string name="account_setup_basics_title">Set up a new account</string>
<string name="account_setup_basics_instructions">Enter this account\'s email address:</string>
<string name="account_setup_basics_instructions2_fmt">(You may add <xliff:g id="number_accounts">%d</xliff:g> more accounts.)</string>
<string name="account_setup_basics_email_hint">Email address</string>
@ -345,21 +349,21 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_incoming_security_ssl_label">SSL (always)</string>
<string name="account_setup_incoming_security_tls_optional_label">TLS (if available)</string>
<string name="account_setup_incoming_security_tls_label">TLS (always)</string>
<string name="account_setup_incoming_delete_policy_label">When I delete a message</string>
<string name="account_setup_incoming_delete_policy_never_label">Do not delete on server</string>
<string name="account_setup_incoming_delete_policy_7days_label">After 7 days</string>
<string name="account_setup_incoming_delete_policy_delete_label">Delete from server</string>
<string name="account_setup_incoming_delete_policy_markread_label">Mark as read on server</string>
<string name="account_setup_incoming_compression_label">Use compression on network:</string>
<string name="account_setup_incoming_mobile_label">Mobile</string>
<string name="account_setup_incoming_wifi_label">Wi-Fi</string>
<string name="account_setup_incoming_other_label">Other</string>
<string name="account_setup_incoming_save_all_headers_title">Downloading of mail headers</string>
<string name="account_setup_incoming_save_all_headers_label">Save all headers locally</string>
<string name="account_setup_expunge_policy_label">Expunge messages</string>
<string name="account_setup_expunge_policy_immediately">Immediately after delete or move</string>
<string name="account_setup_expunge_policy_on_poll">During each poll</string>
@ -367,15 +371,17 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_incoming_imap_path_prefix_label">IMAP path prefix</string>
<string name="account_setup_incoming_imap_path_prefix_hint">(Automatic using NAMESPACE if available)</string>
<string name="account_setup_incoming_imap_folder_drafts">Drafts folder name</string>
<string name="account_setup_incoming_imap_folder_sent">Sent folder name</string>
<string name="account_setup_incoming_imap_folder_trash">Trash folder name</string>
<string name="account_setup_incoming_imap_folder_archive">Archive folder name</string>
<string name="account_setup_incoming_imap_folder_spam">Spam folder name</string>
<string name="account_setup_incoming_imap_folder_outbox">Outbox folder name</string>
<string name="account_setup_incoming_subscribed_folders_only_label">Show only subscribed folders</string>
<string name="account_setup_auto_expand_folder">Auto-expand folder</string>
<string name="account_setup_incoming_webdav_path_prefix_label">WebDAV (Exchange) path</string>
<string name="account_setup_incoming_webdav_path_prefix_hint">Optional</string>
@ -404,10 +410,10 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_outgoing_authentication_imap_before_smtp_label">IMAP before SMTP</string>
<string name="account_setup_outgoing_authentication_webdav_before_smtp_label">WebDAV (Exchange) before SMTP</string>
<string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
<string name="account_setup_bad_uri">Invalid setup: <xliff:g id="err_mess">%s</xliff:g></string>
<string name="account_setup_options_title">Account options</string>
<string name="compact_action">Compact</string>
<string name="clear_action">Clear messages (danger!)</string>
<string name="recreate_action">Recreate data (Last Resort!)</string>
@ -440,7 +446,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="idle_refresh_period_36min">Every 36 minutes</string>
<string name="idle_refresh_period_48min">Every 48 minutes</string>
<string name="idle_refresh_period_60min">Every 60 minutes</string>
<string name="account_setup_options_default_label">Send mail from this account by default</string>
<string name="account_setup_options_notify_label">Notify me when mail arrives</string>
<string name="account_setup_options_notify_sync_label">Notify me while mail is being checked</string>
@ -454,8 +460,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_options_mail_display_count_250">250 messages</string>
<string name="account_setup_options_mail_display_count_500">500 messages</string>
<string name="account_setup_options_mail_display_count_1000">1000 messages</string>
<string name="move_copy_cannot_copy_unsynced_message">Cannot copy or move a message that is not synchronized with the server</string>
<string name="account_setup_failed_dlg_title">Setup could not finish</string>
@ -479,23 +485,22 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_notify_self_summary">Notify even for mail sent from an account identity</string>
<string name="account_settings_notification_opens_unread_label">Notification opens unread messages</string>
<string name="account_settings_notification_opens_unread_summary">Searches for unread messages when Notification is opened</string>
<string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>
<string name="account_settings_hide_buttons_never">Never</string>
<string name="account_settings_hide_buttons_keyboard_avail">When keyboard is available</string>
<string name="account_settings_hide_buttons_always">Always</string>
<string name="account_settings_composition">Writing messages</string>
<string name="account_settings_sync">Syncing folders</string>
<string name="account_settings_sync">Syncing folders</string>
<string name="account_settings_folders">Folders</string>
<string name="account_settings_message_lists">Listing messages</string>
<string name="account_settings_message_view">Viewing messages</string>
<string name="account_settings_message_lists">Listing messages</string>
<string name="account_settings_message_view">Viewing messages</string>
<string name="account_settings_quote_prefix_label">Quote prefix</string>
<string name="account_settings_mail_check_frequency_label">Folder poll check frequency</string>
<string name="account_settings_second_class_check_frequency_label">2nd class check frequency</string>
<string name="account_settings_color_label">Account color</string>
<string name="account_settings_color_summary">Choose the color of the account used in folder and account list</string>
@ -503,7 +508,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_led_color_summary">Choose the color your phone LED should blink for this account</string>
<string name="account_settings_mail_display_count_label">Number of messages to display</string>
<string name="account_settings_message_age_label">Sync messages newer than</string>
<string name="account_settings_message_age_any">the Big Bang</string>
<string name="account_settings_message_age_0">one day</string>
@ -517,8 +522,8 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_message_age_3_months">the last 3 months</string>
<string name="account_settings_message_age_6_months">the last 6 months</string>
<string name="account_settings_message_age_1_year">the last year</string>
<string name="account_settings_folder_display_mode_label">Folders to display</string>
<string name="account_settings_folder_display_mode_all">All</string>
<string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
@ -531,45 +536,45 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_folder_sync_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_sync_mode_none">None</string>
<string name="account_settings_folder_push_mode_label">Folders to check with push</string>
<string name="account_settings_folder_push_mode_all">All</string>
<string name="account_settings_folder_push_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_push_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_push_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_folder_push_mode_none">None</string>
<string name="account_settings_folder_target_mode_label">Move/copy destination folders</string>
<string name="account_settings_folder_target_mode_all">All</string>
<string name="account_settings_folder_target_mode_first_class">Only 1st Class folders</string>
<string name="account_settings_folder_target_mode_first_and_second_class">1st and 2nd Class folders</string>
<string name="account_settings_folder_target_mode_not_second_class">All except 2nd Class folders</string>
<string name="account_settings_sync_remote_deletetions_label">Sync remote deletions</string>
<string name="account_settings_sync_remote_deletetions_summary">Remove messages when deleted on server</string>
<string name="folder_settings_title">Folder settings</string>
<string name="folder_settings_in_top_group_label">Show in top group</string>
<string name="folder_settings_in_top_group_summary">Show near the top of the folder list</string>
<string name="folder_settings_folder_display_mode_label">Folder display class</string>
<string name="folder_settings_folder_display_mode_normal">None</string>
<string name="folder_settings_folder_display_mode_first_class">1st Class</string>
<string name="folder_settings_folder_display_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_sync_mode_label">Folder sync class</string>
<string name="folder_settings_folder_sync_mode_normal">None</string>
<string name="folder_settings_folder_sync_mode_first_class">1st Class</string>
<string name="folder_settings_folder_sync_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_sync_mode_inherited">Same as display class</string>
<string name="folder_settings_folder_push_mode_label">Folder push class</string>
<string name="folder_settings_folder_push_mode_normal">None</string>
<string name="folder_settings_folder_push_mode_first_class">1st Class</string>
<string name="folder_settings_folder_push_mode_second_class">2nd Class</string>
<string name="folder_settings_folder_push_mode_inherited">Same as sync class</string>
<string name="account_settings_incoming_label">Incoming server</string>
<string name="account_settings_incoming_summary">Configure the incoming mail server</string>
<string name="account_settings_outgoing_label">Outgoing server</string>
@ -600,20 +605,20 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_identities_summary">Set up alternate \'From\' addresses and signatures</string>
<string name="manage_identities_title">Manage identities</string>
<string name="manage_identities_context_menu_title">Manage identity</string>
<string name="edit_identity_title">Edit identity</string>
<string name="new_identity_action">New identity</string>
<string name="new_identity_action">New identity</string>
<string name="account_settings_always_bcc_label">Bcc all messages to</string>
<string name="account_settings_always_bcc_summary">Send this address a copy of every outgoing message</string>
<string name="manage_identities_edit_action">Edit</string>
<string name="manage_identities_move_up_action">Move up</string>
<string name="manage_identities_move_down_action">Move down</string>
<string name="manage_identities_move_top_action">Move to top / make default</string>
<string name="manage_identities_remove_action">Remove</string>
<string name="manage_identities_edit_action">Edit</string>
<string name="manage_identities_move_up_action">Move up</string>
<string name="manage_identities_move_down_action">Move down</string>
<string name="manage_identities_move_top_action">Move to top / make default</string>
<string name="manage_identities_remove_action">Remove</string>
<string name="edit_identity_description_label">Identity description</string>
<string name="edit_identity_description_hint">(Optional)</string>
@ -625,21 +630,21 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="edit_identity_reply_to_hint">(Optional)</string>
<string name="edit_identity_signature_label">Signature</string>
<string name="edit_identity_signature_hint">(Optional)</string>
<string name="account_settings_signature_use_label">Use Signature</string>
<string name="account_settings_signature_label">Signature</string>
<string name="account_settings_signature_summary">Append a signature to every message you send</string>
<string name="default_signature">-- \nSent from my Android phone with K-9 Mail. Please excuse my brevity.</string>
<string name="default_identity_description">Initial identity</string>
<string name="choose_identity">Choose identity</string>
<string name="choose_identity_title">Choose identity</string>
<string name="no_identities">Go to Account Settings -&gt; Manage Identities to create identities</string>
<string name="no_removable_identity">You can\'t remove your only identity</string>
<string name="identity_has_no_email">You can\'t use an identity without an email address</string>
<string name="identity_will_not_be_saved">Your identity choice and signature changes will not be saved with a draft</string>
<string name="sort_earliest_first">Earliest messages first</string>
<string name="sort_latest_first">Latest messages first</string>
<string name="sort_sender_alpha">Sender alphabetical</string>
@ -652,7 +657,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="sort_unread_last">Read messages first</string>
<string name="sort_attach_first">Messages with attachments first</string>
<string name="sort_unattached_first">Messages without attachments first</string>
<string name="sort_by">Sort by...</string>
<string name="sort_by_date">Date</string>
<string name="sort_by_sender">Sender</string>
@ -664,32 +669,32 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_delete_dlg_title">Remove Account</string>
<string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail.</string>
<string name="account_recreate_dlg_title">Recreate Account</string>
<string name="account_recreate_dlg_instructions_fmt">All data for \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>
<string name="account_clear_dlg_title">Clear Account</string>
<string name="account_clear_dlg_instructions_fmt">All messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail, but account settings will be retained.</string>
<string name="provider_note_live">Only some \"Plus\" accounts include POP access
allowing this program to connect. If you are not able to sign in with
your correct email address and password, you may not have a paid
\"Plus\" account. Please launch the Web browser to gain access to
these mail accounts.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Unrecognized Certificate</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
<string name="message_help_key">Del (or D) - Delete\u000AR -
Reply\u000AA - Reply All\u000AF - Forward\u000AJ or P - Previous
Message\u000AK, N - Next Message\u000AM - Move\u000AY - Copy\u000AZ - Zoom Out\u000AShift-Z -
Zoom In\u000aG - Star</string>
<string name="message_list_help_key">Del (or D) - Delete\u000AR -
Reply\u000AA - Reply All\u000AC - Compose\u000AF - Forward\u000aM -
Reply\u000AA - Reply All\u000AC - Compose\u000AF - Forward\u000aM -
Move\u000AY - Copy\u000AG - Star\u000AO - Sort type\u000AI - Sort order\u000AQ
- Return to Folders\u000AS - Select/deselect</string>
<string name="folder_list_help_key">
1 - Display only 1st Class folders\u000A
2 - Display 1st and 2nd Class folders\u000A
@ -697,14 +702,14 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
4 - Display all folders\u000A
Q - Return to Accounts\u000A
S - Edit Account Settings</string>
<string name="folder_list_display_mode_label">Folders</string>
<string name="folder_list_display_mode_all">Display all folders</string>
<string name="folder_list_display_mode_first_class">Display only 1st Class folders</string>
<string name="folder_list_display_mode_first_and_second_class">Display 1st and 2nd Class folders</string>
<string name="folder_list_display_mode_not_second_class">Display all except 2nd Class folders</string>
<string name="account_settings_signature__location_label">Signature position</string>
<string name="account_settings_signature__location_before_quoted_text">Before quoted messages</string>
@ -718,7 +723,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="messagelist_preferences">Message Lists</string>
<string name="messageview_preferences">Messages</string>
<string name="settings_theme_label">Theme</string>
<string name="background_ops_label">Background sync</string>
<string name="background_ops_never">Never</string>
<string name="background_ops_always">Always</string>
@ -726,7 +731,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="background_ops_auto_sync">When \'Background data\' &amp; \'Auto-sync\' are checked</string>
<string name="no_message_seletected_toast">No message selected</string>
<string name="date_format_label">Date format</string>
<!--
The values of the date_format_* strings MUST be valid date format strings.
@ -736,7 +741,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd-MMM-yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string>
<string name="batch_ops">Batch Ops</string>
<string name="batch_delete_op">Delete selected</string>
<string name="batch_mark_read_op">Mark selected read</string>
@ -750,7 +755,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="batch_plain_mode">Plain mode</string>
<string name="batch_select_all">Select all</string>
<string name="batch_deselect_all">Clear all selections</string>
<string name="account_setup_push_limit_label">Max folders to check with push</string>
<string name="account_setup_push_limit_10">10 folders</string>
<string name="account_setup_push_limit_25">25 folders</string>
@ -759,7 +764,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_push_limit_250">250 folders</string>
<string name="account_setup_push_limit_500">500 folders</string>
<string name="account_setup_push_limit_1000">1000 folders</string>
<string name="animations_title">Animation</string>
<string name="animations_summary">Use gaudy visual effects</string>
<string name="gestures_title">Gestures</string>
@ -773,25 +778,25 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="measure_accounts_title">Show account size</string>
<string name="measure_accounts_summary">Turn off for faster display</string>
<string name="count_search_title">Count search results</string>
<string name="count_search_summary">Turn off for faster display</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
<string name="flagged_modifier"> - Starred</string>
<string name="unread_modifier"> - Unread</string>
<string name="search_all_messages_title">All messages</string>
<string name="search_all_messages_detail">All messages in searchable folders</string>
<string name="integrated_inbox_title">Integrated Inbox</string>
<string name="integrated_inbox_detail">All messages in integrated folders</string>
<string name="tap_hint">Tap envelope or star for unread or starred messages</string>
<string name="folder_settings_include_in_integrated_inbox_label">Integrate</string>
<string name="folder_settings_include_in_integrated_inbox_summary">Unread messages are shown in Integrated Inbox</string>
<string name="account_settings_searchable_label">Folders to search</string>
<string name="account_settings_searchable_all">All</string>
<string name="account_settings_searchable_displayable">Displayable</string>

48
src/com/fsck/k9/Account.java
View File

@ -72,6 +72,8 @@ public class Account implements BaseAccount
private String mDraftsFolderName;
private String mSentFolderName;
private String mTrashFolderName;
private String mArchiveFolderName;
private String mSpamFolderName;
private String mOutboxFolderName;
private String mAutoExpandFolderName;
private FolderMode mFolderDisplayMode;
@ -194,10 +196,10 @@ public class Account implements BaseAccount
mPushPollOnConnect = preferences.getPreferences().getBoolean(mUuid
+ ".pushPollOnConnect", true);
mDisplayCount = preferences.getPreferences().getInt(mUuid + ".displayCount", K9.DEFAULT_VISIBLE_LIMIT);
if (mDisplayCount < 0)
{
mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;
}
if (mDisplayCount < 0)
{
mDisplayCount = K9.DEFAULT_VISIBLE_LIMIT;
}
mLastAutomaticCheckTime = preferences.getPreferences().getLong(mUuid
+ ".lastAutomaticCheckTime", 0);
mNotifyNewMail = preferences.getPreferences().getBoolean(mUuid + ".notifyNewMail",
@ -213,11 +215,15 @@ public class Account implements BaseAccount
"Sent");
mTrashFolderName = preferences.getPreferences().getString(mUuid + ".trashFolderName",
"Trash");
mArchiveFolderName = preferences.getPreferences().getString(mUuid + ".archiveFolderName",
"Archive");
mSpamFolderName = preferences.getPreferences().getString(mUuid + ".spamFolderName",
"Spam");
mOutboxFolderName = preferences.getPreferences().getString(mUuid + ".outboxFolderName",
"Outbox");
mExpungePolicy = preferences.getPreferences().getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY);
mSyncRemoteDeletions = preferences.getPreferences().getBoolean(mUuid + ".syncRemoteDeletions", true);
mMaxPushFolders = preferences.getPreferences().getInt(mUuid + ".maxPushFolders", 10);
goToUnreadMessageSearch = preferences.getPreferences().getBoolean(mUuid + ".goToUnreadMessageSearch",
false);
@ -380,6 +386,8 @@ public class Account implements BaseAccount
editor.remove(mUuid + ".draftsFolderName");
editor.remove(mUuid + ".sentFolderName");
editor.remove(mUuid + ".trashFolderName");
editor.remove(mUuid + ".archiveFolderName");
editor.remove(mUuid + ".spamFolderName");
editor.remove(mUuid + ".outboxFolderName");
editor.remove(mUuid + ".autoExpandFolderName");
editor.remove(mUuid + ".accountNumber");
@ -470,6 +478,8 @@ public class Account implements BaseAccount
editor.putString(mUuid + ".draftsFolderName", mDraftsFolderName);
editor.putString(mUuid + ".sentFolderName", mSentFolderName);
editor.putString(mUuid + ".trashFolderName", mTrashFolderName);
editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName);
editor.putString(mUuid + ".spamFolderName", mSpamFolderName);
editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName);
editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName);
editor.putInt(mUuid + ".accountNumber", mAccountNumber);
@ -494,7 +504,7 @@ public class Account implements BaseAccount
editor.putBoolean(mUuid + ".subscribedFoldersOnly", subscribedFoldersOnly);
editor.putInt(mUuid + ".maximumPolledMessageAge", maximumPolledMessageAge);
editor.putString(mUuid + ".quotePrefix", mQuotePrefix);
for (String type : networkTypes)
{
Boolean useCompression = compressionMap.get(type);
@ -532,10 +542,12 @@ public class Account implements BaseAccount
//folder.refresh(prefs);
Folder.FolderClass fMode = localFolder.getDisplayClass(prefs);
// Always get stats about the INBOX (see issue 1817)
// Always get stats about the INBOX (see issue 1817)
if (folder.getName().equals(K9.INBOX) || (
folder.getName().equals(getTrashFolderName()) == false &&
folder.getName().equals(getDraftsFolderName()) == false &&
folder.getName().equals(getArchiveFolderName()) == false &&
folder.getName().equals(getSpamFolderName()) == false &&
folder.getName().equals(getOutboxFolderName()) == false &&
folder.getName().equals(getSentFolderName()) == false &&
folder.getName().equals(getErrorFolderName()) == false))
@ -853,6 +865,26 @@ public class Account implements BaseAccount
mTrashFolderName = trashFolderName;
}
public synchronized String getArchiveFolderName()
{
return mArchiveFolderName;
}
public synchronized void setArchiveFolderName(String archiveFolderName)
{
mArchiveFolderName = archiveFolderName;
}
public synchronized String getSpamFolderName()
{
return mSpamFolderName;
}
public synchronized void setSpamFolderName(String spamFolderName)
{
mSpamFolderName = spamFolderName;
}
public synchronized String getOutboxFolderName()
{
return mOutboxFolderName;
@ -1316,7 +1348,7 @@ public class Account implements BaseAccount
now.add(Calendar.YEAR, -1);
break;
}
return now.getTime();
}
else

12
src/com/fsck/k9/activity/FolderList.java
View File

@ -566,7 +566,7 @@ public class FolderList extends K9ListActivity
private void onOpenFolder(String folder)
{
MessageList.actionHandleFolder(this, mAccount, folder);
if (K9.manageBack())
if (K9.manageBack())
{
finish();
}
@ -1427,6 +1427,16 @@ public class FolderList extends K9ListActivity
this.displayName = String.format(getString(R.string.special_mailbox_name_sent_fmt), this.name);
}
if (this.name.equals(mAccount.getArchiveFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_archive_fmt), this.name);
}
if (this.name.equals(mAccount.getSpamFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_spam_fmt), this.name);
}
this.lastChecked = folder.getLastUpdate();
String mess = truncateStatus(folder.getStatus());

16
src/com/fsck/k9/activity/MessageList.java
View File

@ -418,7 +418,7 @@ public class MessageList
{
setIntent(intent); // onNewIntent doesn't autoset our "internal" intent
// Only set "touchable" when we're first starting up the
// Only set "touchable" when we're first starting up the
// activity. otherwise we get force closes when the user
// toggles it midstream
mTouchView = K9.messageListTouchable();
@ -1930,11 +1930,11 @@ public class MessageList
* 2010-06-21 - cketti
* Added null pointer check. Not sure what's causing 'holder'
* to be null. See log provided in issue 1749, comment #15.
*
*
* Please remove this comment once the cause was found and the
* bug(?) fixed.
*/
if ((holder != null) &&
if ((holder != null) &&
holder.message.equalsReference(messageReference))
{
return holder;
@ -2659,6 +2659,16 @@ public class MessageList
{
this.displayName = String.format(getString(R.string.special_mailbox_name_sent_fmt), this.name);
}
if (this.name.equals(account.getArchiveFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_archive_fmt), this.name);
}
if (this.name.equals(account.getSpamFolderName()))
{
this.displayName = String.format(getString(R.string.special_mailbox_name_spam_fmt), this.name);
}
}
}

2
src/com/fsck/k9/activity/setup/AccountSetupBasics.java
View File

@ -269,6 +269,8 @@ public class AccountSetupBasics extends K9Activity
mAccount.setTransportUri(outgoingUri.toString());
mAccount.setDraftsFolderName(getString(R.string.special_mailbox_name_drafts));
mAccount.setTrashFolderName(getString(R.string.special_mailbox_name_trash));
mAccount.setArchiveFolderName(getString(R.string.special_mailbox_name_archive));
mAccount.setSpamFolderName(getString(R.string.special_mailbox_name_spam));
mAccount.setOutboxFolderName(getString(R.string.special_mailbox_name_outbox));
mAccount.setSentFolderName(getString(R.string.special_mailbox_name_sent));
AccountSetupCheckSettings.actionCheckSettings(this, mAccount, true, true);

33
src/com/fsck/k9/activity/setup/AccountSetupIncoming.java
View File

@ -30,7 +30,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
private static final int SELECT_DRAFT_FOLDER = 100;
private static final int SELECT_SENT_FOLDER = 101;
private static final int SELECT_TRASH_FOLDER = 102;
//private static final int SELECT_OUTBOX_FOLDER = 103;
private static final int SELECT_ARCHIVE_FOLDER = 103;
private static final int SELECT_SPAM_FOLDER = 104;
private static final int popPorts[] =
{
@ -75,6 +76,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
private Button mImapFolderDrafts;
private Button mImapFolderSent;
private Button mImapFolderTrash;
private Button mImapFolderArchive;
private Button mImapFolderSpam;
private EditText mImapFolderOutbox;
private EditText mWebdavPathPrefixView;
private EditText mWebdavAuthPathView;
@ -124,6 +127,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts = (Button)findViewById(R.id.account_imap_folder_drafts);
mImapFolderSent = (Button)findViewById(R.id.account_imap_folder_sent);
mImapFolderTrash = (Button)findViewById(R.id.account_imap_folder_trash);
mImapFolderArchive = (Button)findViewById(R.id.account_imap_folder_archive);
mImapFolderSpam = (Button)findViewById(R.id.account_imap_folder_spam);
mImapFolderOutbox = (EditText)findViewById(R.id.account_imap_folder_outbox);
mWebdavPathPrefixView = (EditText)findViewById(R.id.webdav_path_prefix);
mWebdavAuthPathView = (EditText)findViewById(R.id.webdav_auth_path);
@ -143,6 +148,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts.setOnClickListener(this);
mImapFolderSent.setOnClickListener(this);
mImapFolderTrash.setOnClickListener(this);
mImapFolderArchive.setOnClickListener(this);
mImapFolderSpam.setOnClickListener(this);
mNextButton.setOnClickListener(this);
SpinnerOption securityTypes[] =
@ -287,6 +294,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mImapFolderDrafts.setText(mAccount.getDraftsFolderName());
mImapFolderSent.setText(mAccount.getSentFolderName());
mImapFolderTrash.setText(mAccount.getTrashFolderName());
mImapFolderArchive.setText(mAccount.getArchiveFolderName());
mImapFolderSpam.setText(mAccount.getSpamFolderName());
mImapFolderOutbox.setText(mAccount.getOutboxFolderName());
if (uri.getScheme().startsWith("pop3"))
@ -474,6 +483,12 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
case SELECT_TRASH_FOLDER:
mImapFolderTrash.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
case SELECT_ARCHIVE_FOLDER:
mImapFolderArchive.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
case SELECT_SPAM_FOLDER:
mImapFolderSpam.setText(data.getStringExtra(ChooseFolder.EXTRA_NEW_FOLDER));
return;
}
if (Intent.ACTION_EDIT.equals(getIntent().getAction()))
{
@ -567,6 +582,8 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
mAccount.setDraftsFolderName(mImapFolderDrafts.getText().toString());
mAccount.setSentFolderName(mImapFolderSent.getText().toString());
mAccount.setTrashFolderName(mImapFolderTrash.getText().toString());
mAccount.setArchiveFolderName(mImapFolderArchive.getText().toString());
mAccount.setSpamFolderName(mImapFolderSpam.getText().toString());
mAccount.setOutboxFolderName(mImapFolderOutbox.getText().toString());
mAccount.setCompression(Account.TYPE_MOBILE, compressionMobile.isChecked());
mAccount.setCompression(Account.TYPE_WIFI, compressionWifi.isChecked());
@ -622,6 +639,12 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
case R.id.account_imap_folder_trash:
selectImapFolder(SELECT_TRASH_FOLDER);
break;
case R.id.account_imap_folder_archive:
selectImapFolder(SELECT_ARCHIVE_FOLDER);
break;
case R.id.account_imap_folder_spam:
selectImapFolder(SELECT_SPAM_FOLDER);
break;
}
}
catch (Exception e)
@ -647,6 +670,14 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener
curFolder = mImapFolderTrash.getText().toString();
showFolderNone = true;
break;
case SELECT_ARCHIVE_FOLDER:
curFolder = mImapFolderArchive.getText().toString();
showFolderNone = true;
break;
case SELECT_SPAM_FOLDER:
curFolder = mImapFolderSpam.getText().toString();
showFolderNone = true;
break;
default:
throw new IllegalArgumentException(
"Cannot select folder for: " + activityCode);