mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-23 18:02:15 -05:00
Reorgnaize the Account Settings page, regrouping options by "what a reasonable user might want to change at the same time"
Make our use of email/mail consistent. It's "mail" except for "Email address" Rephrase a number of unclear or oddly phrased messages (many dating from AOSP)
This commit is contained in:
Jesse Vincent
parent
1c90d142ac
commit
20d9a19a97
@ -110,17 +110,17 @@
|
||||
<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="notification_new_title">New email</string>
|
||||
<string name="notification_new_scrolling">New email from <xliff:g id="sender">%s</xliff:g></string>
|
||||
<string name="notification_new_title">New mail</string>
|
||||
<string name="notification_new_scrolling">New mail from <xliff:g id="sender">%s</xliff:g></string>
|
||||
<string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Unread (<xliff:g id="account">%s</xliff:g>)</string> <!-- 279 Unread (someone@google.com) -->
|
||||
<string name="notification_new_one_account_unknown_unread_count_fmt"><xliff:g id="new_message_count">%d</xliff:g> New Email(s) (<xliff:g id="account">%s</xliff:g>)</string> <!-- 2 New Email(s) (someone@google.com) -->
|
||||
<string name="notification_new_multi_account_fmt">in <xliff:g id="number_accounts">%d</xliff:g> accounts</string>
|
||||
<string name="notification_unsent_title">Message not sent</string>
|
||||
|
||||
<string name="notification_bg_sync_ticker">Checking email: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
|
||||
<string name="notification_bg_sync_title">Checking email</string>
|
||||
<string name="notification_bg_send_ticker">Sending email: <xliff:g id="account">%s</xliff:g></string>
|
||||
<string name="notification_bg_send_title">Sending email</string>
|
||||
<string name="notification_bg_sync_ticker">Checking mail: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
|
||||
<string name="notification_bg_sync_title">Checking mail</string>
|
||||
<string name="notification_bg_send_ticker">Sending mail: <xliff:g id="account">%s</xliff:g></string>
|
||||
<string name="notification_bg_send_title">Sending mail</string>
|
||||
<string name="notification_bg_title_separator">:</string>
|
||||
|
||||
<string name="special_mailbox_name_inbox">Inbox</string>
|
||||
@ -152,7 +152,7 @@
|
||||
<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 email client for Android based on the standard Android Mail client.
|
||||
Welcome to K-9 Mail setup. K-9 is an open source mail client for Android based on the standard Android Mail client.
|
||||
\n
|
||||
\nK-9's improved features include:
|
||||
* Push mail using IMAP IDLE
|
||||
@ -169,7 +169,7 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
* Empty Trash
|
||||
* Message sorting
|
||||
* ...and more
|
||||
\nPlease note that K-9 does not support most free hotmail accounts and, like many email clients, has some quirks when talking to Microsoft Exchange.
|
||||
\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.
|
||||
\nSubmit bug reports, contribute new features and ask questions at http://code.google.com/p/k9mail
|
||||
|
||||
</string>
|
||||
@ -235,14 +235,14 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<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="account_setup_basics_title">Set up email</string>
|
||||
<string name="account_setup_basics_instructions">Type your account email address:</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>
|
||||
<string name="account_setup_basics_email_error_invalid_fmt"><xliff:g id="email">%s</xliff:g> is not a valid email address.</string>
|
||||
<string name="account_setup_basics_email_error_duplicate_fmt"><xliff:g id="email">%s</xliff:g> is already added.</string>
|
||||
<string name="account_setup_basics_password_hint">Password</string>
|
||||
<string name="account_setup_basics_default_label">Send email from this account by default</string>
|
||||
<string name="account_setup_basics_default_label">Send mail from this account by default</string>
|
||||
<string name="account_setup_basics_manual_setup_action">Manual setup</string>
|
||||
|
||||
<string name="account_setup_check_settings_title"></string>
|
||||
@ -252,25 +252,25 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<string name="account_setup_check_settings_finishing_msg">Finishing\u2026</string>
|
||||
<string name="account_setup_check_settings_canceling_msg">Canceling\u2026</string>
|
||||
|
||||
<string name="account_setup_names_title">Set up email</string>
|
||||
<string name="account_setup_names_instructions">Your account is set up, and email is on its way!</string>
|
||||
<string name="account_setup_names_title">Almost done!</string>
|
||||
<string name="account_setup_names_instructions">Your account is set up, and mail is on its way!</string>
|
||||
<string name="account_setup_names_account_name_label">Give this account a name (optional):</string>
|
||||
<string name="account_setup_names_user_name_label">Type your name (displays on outgoing messages):</string>
|
||||
|
||||
<string name="account_setup_finished_toast">Your account is set up!\n\nFetching email\u2026</string>
|
||||
<string name="account_setup_finished_toast">Your account is set up!\n\nFetching mail\u2026</string>
|
||||
|
||||
<string name="account_setup_account_type_title">Add new email account</string>
|
||||
<string name="account_setup_account_type_title">Account type</string>
|
||||
<string name="account_setup_account_type_instructions">What type of account is this?</string>
|
||||
<string name="account_setup_account_type_pop_action">POP3 account</string>
|
||||
<string name="account_setup_account_type_imap_action">IMAP account</string>
|
||||
<string name="account_setup_account_type_webdav_action">WebDav(Exchange) account</string>
|
||||
<string name="account_setup_account_type_pop_action">POP3</string>
|
||||
<string name="account_setup_account_type_imap_action">IMAP</string>
|
||||
<string name="account_setup_account_type_webdav_action">WebDAV (Exchange)</string>
|
||||
|
||||
<string name="account_setup_incoming_title">Incoming server settings</string>
|
||||
<string name="account_setup_incoming_username_label">Username</string>
|
||||
<string name="account_setup_incoming_password_label">Password</string>
|
||||
<string name="account_setup_incoming_pop_server_label">POP3 server</string>
|
||||
<string name="account_setup_incoming_imap_server_label">IMAP server</string>
|
||||
<string name="account_setup_incoming_webdav_server_label">WebDav(Exchange) server</string>
|
||||
<string name="account_setup_incoming_webdav_server_label">WebDAV (Exchange) server</string>
|
||||
<string name="account_setup_incoming_port_label">Port</string>
|
||||
<string name="account_setup_incoming_security_label">Security type</string>
|
||||
<string name="account_setup_incoming_security_none_label">None</string>
|
||||
@ -295,7 +295,7 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
|
||||
<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_label">WebDAV (Exchange) path</string>
|
||||
<string name="account_setup_incoming_webdav_path_prefix_hint">Optional</string>
|
||||
|
||||
<string name="account_setup_incoming_webdav_auth_path_label">Authentication path</string>
|
||||
@ -321,7 +321,7 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<string name="account_setup_outgoing_authentication_basic_password_label">Password</string>
|
||||
<string name="account_setup_outgoing_authentication_pop_before_smtp_label">POP before SMTP</string>
|
||||
<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_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>
|
||||
|
||||
@ -345,12 +345,12 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<string name="account_setup_options_mail_check_frequency_12hour">Every 12 hours</string>
|
||||
<string name="account_setup_options_mail_check_frequency_24hour">Every 24 hours</string>
|
||||
|
||||
<string name="account_setup_options_default_label">Send email from this account by default</string>
|
||||
<string name="account_setup_options_notify_label">Notify me when email arrives</string>
|
||||
<string name="account_setup_options_notify_sync_label">Notify me while email is being checked</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>
|
||||
|
||||
<!-- Number of displayed messages, also used in account_settings_* -->
|
||||
<string name="account_setup_options_mail_display_count_label">Number of emails to display</string>
|
||||
<string name="account_setup_options_mail_display_count_label">Number of mails to display</string>
|
||||
<string name="account_setup_options_mail_display_count_10">10 messages</string>
|
||||
<string name="account_setup_options_mail_display_count_25">25 messages</string>
|
||||
<string name="account_setup_options_mail_display_count_50">50 messages</string>
|
||||
@ -368,12 +368,12 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<string name="account_settings_title_fmt">General settings</string>
|
||||
<string name="account_settings_default">Default account</string>
|
||||
<string name="account_settings_default_label">Default account</string>
|
||||
<string name="account_settings_default_summary">Send email from this account by default</string>
|
||||
<string name="account_settings_notify_label">Email notifications</string>
|
||||
<string name="account_settings_notify_sync_label">Email check notifications</string>
|
||||
<string name="account_settings_default_summary">Send mail from this account by default</string>
|
||||
<string name="account_settings_notify_label">New mail notifications</string>
|
||||
<string name="account_settings_notify_sync_label">Sync notifications</string>
|
||||
<string name="account_settings_email_label">Your email address</string>
|
||||
<string name="account_settings_notify_summary">Notify in status bar when email arrives</string>
|
||||
<string name="account_settings_notify_sync_summary">Notify in status bar while email is checked</string>
|
||||
<string name="account_settings_notify_summary">Notify in status bar when mail arrives</string>
|
||||
<string name="account_settings_notify_sync_summary">Notify in status bar while mail is checked</string>
|
||||
<string name="account_settings_show_combined_label">Show combined Inbox</string>
|
||||
|
||||
<string name="account_settings_hide_buttons_label">Scroll navigation buttons</string>
|
||||
@ -381,12 +381,16 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<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_display_sync">Display and synchronization</string>
|
||||
<string name="account_settings_composition">Writing messages</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_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_mail_display_count_label">Number of emails to display</string>
|
||||
<string name="account_settings_mail_display_count_label">Number of messages to display</string>
|
||||
|
||||
<string name="account_settings_folder_display_mode_label">Folders to display</string>
|
||||
<string name="account_settings_folder_display_mode_all">All</string>
|
||||
@ -432,30 +436,32 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<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 settings</string>
|
||||
<string name="account_settings_incoming_summary">Configure the incoming email server</string>
|
||||
<string name="account_settings_outgoing_label">Outgoing settings</string>
|
||||
<string name="account_settings_outgoing_summary">Configure the outgoing email server</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>
|
||||
<string name="account_settings_outgoing_summary">Configure the outgoing mail (SMTP) server</string>
|
||||
<string name="account_settings_add_account_label">Add another account</string>
|
||||
<string name="account_settings_description_label">Account name</string>
|
||||
<string name="account_settings_name_label">Your name</string>
|
||||
<string name="account_settings_notifications">Notification settings</string>
|
||||
<string name="account_settings_notifications">Notifications</string>
|
||||
<string name="account_settings_vibrate_enable">Vibrate</string>
|
||||
<string name="account_settings_vibrate_summary">Vibrate when email arrives</string>
|
||||
<string name="account_settings_ringtone">Select ringtone</string>
|
||||
<string name="account_settings_vibrate_summary">Vibrate when mail arrives</string>
|
||||
<string name="account_settings_ringtone">New mail ringtone</string>
|
||||
<string name="account_settings_servers">Server settings</string>
|
||||
|
||||
<string name="account_settings_composition_title">Message composition options</string>
|
||||
<string name="account_settings_composition_label">Composing messages</string>
|
||||
<string name="account_settings_composition_label">Composition defaults</string>
|
||||
<string name="account_settings_composition_summary">Set your default From, Bcc and signature</string>
|
||||
|
||||
<string name="account_settings_identities_label">Manage identities</string>
|
||||
<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 identities</string>
|
||||
<string name="new_identity_action">Create new identity</string>
|
||||
<string name="edit_identity_title">Edit 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>
|
||||
@ -484,9 +490,9 @@ Welcome to K-9 Mail setup. K-9 is an open source email client for Android based
|
||||
<string name="choose_identity_title">Choose identity</string>
|
||||
|
||||
<string name="no_identities">Go to Account Settings -> Manage Identities to create identities</string>
|
||||
<string name="no_removable_identity">Cannot remove only identity</string>
|
||||
<string name="identity_has_no_email">Cannot choose an identity which has no email address</string>
|
||||
<string name="identity_will_not_be_saved">Identity choice and signature edits will not be saved with a draft</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>
|
||||
|
||||
@ -30,6 +30,9 @@
|
||||
android:key="account_default"
|
||||
android:title="@string/account_settings_default_label"
|
||||
android:summary="@string/account_settings_default_summary" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_message_lists">
|
||||
|
||||
<ListPreference
|
||||
android:key="account_display_count"
|
||||
@ -37,6 +40,9 @@
|
||||
android:entries="@array/account_settings_display_count_entries"
|
||||
android:entryValues="@array/account_settings_display_count_values"
|
||||
android:dialogTitle="@string/account_settings_mail_display_count_label" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_message_view">
|
||||
|
||||
<ListPreference
|
||||
android:key="hide_buttons_enum"
|
||||
@ -45,17 +51,9 @@
|
||||
android:entryValues="@array/account_settings_hide_buttons_values"
|
||||
android:dialogTitle="@string/account_settings_hide_buttons_label" />
|
||||
|
||||
<Preference
|
||||
android:key="account_setup_auto_expand_folder"
|
||||
android:singleLine="true"
|
||||
android:title="@string/account_setup_auto_expand_folder"
|
||||
android:summary=""
|
||||
/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_display_sync">
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_sync">
|
||||
<ListPreference
|
||||
android:key="account_check_frequency"
|
||||
android:title="@string/account_settings_mail_check_frequency_label"
|
||||
@ -77,6 +75,29 @@
|
||||
android:entryValues="@array/account_settings_folder_push_mode_values"
|
||||
android:dialogTitle="@string/account_settings_folder_push_mode_label" />
|
||||
|
||||
<ListPreference
|
||||
android:key="delete_policy"
|
||||
android:title="@string/account_setup_incoming_delete_policy_label"
|
||||
android:entries="@array/account_setup_delete_policy_entries"
|
||||
android:entryValues="@array/account_setup_delete_policy_values"
|
||||
android:dialogTitle="@string/account_setup_incoming_delete_policy_label" />
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="incoming"
|
||||
android:title="@string/account_settings_incoming_label"
|
||||
android:summary="@string/account_settings_incoming_summary"
|
||||
/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_folders">
|
||||
|
||||
<Preference
|
||||
android:key="account_setup_auto_expand_folder"
|
||||
android:singleLine="true"
|
||||
android:title="@string/account_setup_auto_expand_folder"
|
||||
android:summary=""
|
||||
/>
|
||||
<ListPreference
|
||||
android:key="folder_display_mode"
|
||||
android:title="@string/account_settings_folder_display_mode_label"
|
||||
@ -92,22 +113,29 @@
|
||||
android:dialogTitle="@string/account_settings_folder_target_mode_label" />
|
||||
|
||||
|
||||
<ListPreference
|
||||
android:key="delete_policy"
|
||||
android:title="@string/account_setup_incoming_delete_policy_label"
|
||||
android:entries="@array/account_setup_delete_policy_entries"
|
||||
android:entryValues="@array/account_setup_delete_policy_values"
|
||||
android:dialogTitle="@string/account_setup_incoming_delete_policy_label" />
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_composition">
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="composition"
|
||||
android:title="@string/account_settings_composition_label" />
|
||||
android:summary="@string/account_settings_composition_summary"
|
||||
android:title="@string/account_settings_composition_label"
|
||||
|
||||
/>
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="manage_identities"
|
||||
android:title="@string/account_settings_identities_label" />
|
||||
android:title="@string/account_settings_identities_label"
|
||||
android:summary="@string/account_settings_identities_summary"
|
||||
/>
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="outgoing"
|
||||
android:title="@string/account_settings_outgoing_label"
|
||||
android:summary="@string/account_settings_outgoing_summary"
|
||||
|
||||
/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
@ -143,17 +171,4 @@
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/account_settings_servers">
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="incoming"
|
||||
android:title="@string/account_settings_incoming_label" />
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="outgoing"
|
||||
android:title="@string/account_settings_outgoing_label" />
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user