ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Edit to strings per UI text standards."

Browse Source
This commit is contained in:
Claudia de Veaux 2011-12-07 14:36:01 -08:00 committed by Android (Google) Code Review
commit 886acf7420
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
res/values/strings.xml
View File

@ -19,12 +19,12 @@
<!-- Permissions label for reading attachments -->
<string name="permission_read_attachment_label">Read email attachments</string>
<!-- Permissions description for reading attachments -->
<string name="permission_read_attachment_desc">Allows this application to read your email
<string name="permission_read_attachment_desc">Allows the app to read your email
attachments.</string>
<!-- Permissions label for accessing the main provider -->
<string name="permission_access_provider_label">Access email provider data</string>
<!-- Permissions description for accessing the main provider -->
<string name="permission_access_provider_desc">Allows this application to access your email
<string name="permission_access_provider_desc">Allows the app to access your email
database, including received messages, sent messages, usernames, and passwords.</string>
<!-- Name of application on Home screen -->
@ -66,7 +66,7 @@
<string name="delete_quick_response_action">Delete</string>
<!-- Message informing user when a list that would contain quick responses
is empty [CHAR_LIMIT=80] -->
<string name="quick_responses_empty_view">No quick responses</string>
<string name="quick_responses_empty_view">No quick responses.</string>
<!-- Menu item/button name -->
<string name="discard_action">Discard</string>
<!-- Menu item/button name [CHAR_LIMIT=16] -->
@ -315,7 +315,7 @@
[CHAR_LIMIT=32] -->
<string name="message_compose_include_quoted_text_checkbox_label">Include text</string>
<!-- Toast that appears if you try to send with no recipients. -->
<string name="message_compose_error_no_recipients">You must add at least one recipient.</string>
<string name="message_compose_error_no_recipients">Add at least one recipient.</string>
<!-- An address field contains invalid email addresses. -->
<string name="message_compose_error_invalid_email">Some email addresses are invalid.</string>
<!-- Toast that appears when an attachment is too big to send. -->
@ -357,10 +357,10 @@
<string name="message_view_status_attachment_saved">Attachment saved
as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Toast after attachment could not be saved [CHAR LIMIT=30] -->
<string name="message_view_status_attachment_not_saved">Couldn\'t save the attachment.</string>
<string name="message_view_status_attachment_not_saved">Couldn\'t save attachment.</string>
<!-- Toast upon using "send" when one or more attachments will need to be background loaded
[CHAR LIMIT=none]-->
<string name="message_view_attachment_background_load">Note: One or more attachments in your
<string name="message_view_attachment_background_load">One or more attachments in your
forwarded message will be downloaded prior to sending.</string>
<!--Button on the message view screen to show the message content [CHAR LIMIT=16] -->
<string name="message_view_show_message_action">Message</string>
@ -495,7 +495,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
<string name="login_failed_ticker">
<xliff:g id="account_name">%s</xliff:g> signin failed.</string>
<xliff:g id="account_name">%s</xliff:g> signin unsuccessful.</string>
<!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
<string name="login_failed_title">Couldn\'t sign in</string>
@ -555,7 +555,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="account_setup_basics_password_label">Password</string>
<!-- On "Set up email" screen, checkbox label for making the new account the default account -->
<string name="account_setup_basics_default_label">
Send email from this account by default.</string>
Send email from this account by default</string>
<!-- Button name on "Set up email" screen -->
<string name="account_setup_basics_manual_setup_action">Manual setup</string>
<!-- Toast when we can't build a URI from the given email & password -->
@ -590,7 +590,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Text that appears on "Set up email" screen after successfully setting up an account
[CHAR LIMIT=none] -->
<string name="account_setup_names_headline">
Your account is set up, and email is on its way!</string>
Your account is set up and email is on its way!</string>
<!-- On "Set up email" screen, label of text field -->
<string name="account_setup_names_account_name_label">
Give this account a name (optional)</string>
@ -681,7 +681,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- On "Outgoing server settings" screen, label for pop-up menu -->
<string name="account_setup_outgoing_security_label">Security type</string>
<!-- On "Outgoing server settings" screen, label for check box -->
<string name="account_setup_outgoing_require_login_label">Require sign-in.</string>
<string name="account_setup_outgoing_require_login_label">Require signin</string>
<!-- On "Outgoing server settings" screen, label for text field -->
<string name="account_setup_outgoing_username_label">Username</string>
<!-- On "Outgoing server settings" screen, label for text field -->
@ -735,20 +735,16 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="account_setup_options_mail_check_frequency_1hour">Every hour</string>
<!-- Check box label on "Set up email" screen to make this the default account -->
<!-- Note, this should usually match the default account summary preference string -->
<string name="account_setup_options_default_label">Send email from this account by default.</string>
<string name="account_setup_options_default_label">Send email from this account by default</string>
<!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
<string name="account_setup_options_notify_label">Notify me when email arrives.</string>
<string name="account_setup_options_notify_label">Notify me when email arrives</string>
<!-- In Account setup options screen, optional check box to also sync contacts -->
<string name="account_setup_options_sync_contacts_label">Sync contacts from this account.
</string>
<string name="account_setup_options_sync_contacts_label">Sync contacts from this account</string>
<!-- In Account setup options screen, optional check box to also sync contacts -->
<string name="account_setup_options_sync_calendar_label">Sync calendar from this account.
</string>
<string name="account_setup_options_sync_calendar_label">Sync calendar from this account</string>
<!-- In Account setup options screen, check box to sync email -->
<string name="account_setup_options_sync_email_label">Sync email from this account.
</string>
<!-- In Account setup options screen, check box to auto-download attachments [CHAR LIMIT=none]
-->
<string name="account_setup_options_sync_email_label">Sync email from this account</string>
<!-- In Account setup options screen, check box to auto-download attachments [CHAR LIMIT=none] -->
<string name="account_setup_options_background_attachments_label">
Automatically download attachments when connected to Wi-Fi</string>
<!-- Dialog title when "setup" could not finish -->
@ -774,9 +770,9 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="account_setup_options_mail_window_default">Use account\'s default</string>
<!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
<string name="account_setup_failed_dlg_auth_message">Username or password incorrect.</string>
<string name="account_setup_failed_dlg_auth_message">Username or password is incorrect.</string>
<!-- "Setup could not finish" dialog text; e.g., Username or password incorrect\n(ERR01 Account does not exist) -->
<string name="account_setup_failed_dlg_auth_message_fmt">Username or password incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string>
<string name="account_setup_failed_dlg_auth_message_fmt">Username or password is incorrect.\n(<xliff:g id="error">%s</xliff:g>)</string>
<!-- An error message presented to the user when the server's identity
cannot be established or trusted [CHAR LIMIT=NONE] -->
@ -789,16 +785,15 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- An error message presented to the user when the server requires a
client certificate to connect [CHAR LIMIT=NONE] -->
<string name="account_setup_failed_certificate_required"
>Client certificate is required. Connect to server with client certificate?</string>
>A client certificate is required. Do you want to connect to the server with a client certificate?</string>
<!-- An error message presented to the user when the certificate they
specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
<string name="account_setup_failed_certificate_inaccessible"
>Certificate is invalid or inaccessible.</string>
>The certificate is invalid or inaccessible.</string>
<!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
<string name="account_setup_failed_check_credentials_message">
The server responded with an error. Check your username and password
then try again.</string>
The server responded with an error. Check your username and password, then try again.</string>
<!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
<string name="account_setup_failed_dlg_server_message">Can\'t connect to server.</string>
@ -832,7 +827,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
[CHAR LIMIT=none] -->
<string name="account_setup_security_policies_required_fmt">
The server <xliff:g id="server">%s</xliff:g> requires that you allow it to remotely control
some security features of your Android device. Do you want to finish setting up this
some security features of your Android device. Do you want to finish setting up this
account?</string>
<!-- Additional diagnostic text when validation failed due to required provisioning not
being supported [CHAR LIMIT=none] -->
@ -861,7 +856,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- Notification ticker when device security required (note: unused in Holo XL) -->
<string name="security_unsupported_ticker_fmt">
Account \"<xliff:g id="account">%s</xliff:g>\" cannot be synced due to security
Account \"<xliff:g id="account">%s</xliff:g>\" can\'t be synced due to security
requirements.</string>
<!-- Notification ticker when device security required (note: unused in Holo XL) -->
<string name="security_needed_ticker_fmt">
@ -878,7 +873,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="security_notification_content_change_title">Security policies have
changed</string>
<!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
<string name="security_notification_content_unsupported_title">Security policies cannot be
<string name="security_notification_content_unsupported_title">Security policies can\'t be
met</string>
<!-- Title of the activity that dispatches changes to device security. Not normally seen. -->
<string name="account_security_title">Device security</string>
@ -908,15 +903,15 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="password_expire_warning_dialog_title">Lock screen password expiring</string>
<!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
<string name="password_expire_warning_dialog_content_fmt">
You must change your lock screen PIN or password soon, or the data for
<xliff:g id="account">%s</xliff:g> will be erased. Change it now?</string>
You need to change your lock screen PIN or password soon, or the data for
<xliff:g id="account">%s</xliff:g> will be erased. Do you want to change it now?</string>
<!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
<string name="password_expired_dialog_title">Lock screen password expired</string>
<!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
<string name="password_expired_dialog_content_fmt">
The data for <xliff:g id="account">%s</xliff:g> is being erased from your device.
You can restore it by changing your lock screen PIN or password. Change it now?</string>
You can restore it by changing your lock screen PIN or password. Do you want to change it now?</string>
<!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
without checking/saving [CHAR LIMIT=none]-->
@ -929,7 +924,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
[CHAR_LIMIT=none] -->
<string name="account_settings_login_dialog_content_fmt">
The username or password for <xliff:g id="account">%s</xliff:g> is incorrect.
Update them now?</string>
Do you want to update them now?</string>
<!-- On Settings screen, setting option name -->
<string name="account_settings_default_label">Default account</string>
@ -948,7 +943,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
[CHAR LIMIT=50] -->
<string name="account_settings_summary">Sync frequency, notifications, etc.</string>
<!-- On Settings screen, setting summary text -->
<string name="account_settings_notify_summary">Notify in System bar when email arrives</string>
<string name="account_settings_notify_summary">Send notification when email arrives</string>
<!-- On Settings screen, setting option name and title of dialog box that opens -->
<string name="account_settings_mail_check_frequency_label">Inbox check frequency</string>
<!-- On Settings screen, setting option name -->
@ -972,7 +967,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- On Settings screen, label for button that attempts to sync the account -->
<string name="account_settings_retry_label">Attempt sync</string>
<!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
<string name="account_settings_retry_summary">Tap here to attempt to sync this account (i.e. if server settings have changed)</string>
<string name="account_settings_retry_summary">Touch here to sync this account</string>
<!-- On Settings screen, setting option name -->
<string name="account_settings_description_label">Account name</string>
<!-- On Settings screen, setting option name -->
@ -984,7 +979,7 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<string name="account_settings_edit_quick_responses_label">Quick responses</string>
<!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
<string name="account_settings_edit_quick_responses_summary">
Edit text that you frequently insert when composing emails</string>
Edit text that you frequently insert when composing email</string>
<!-- On Settings screen, setting option name -->
<string name="account_settings_signature_hint">Append text to messages you send</string>
<!-- On Settings screen, section heading -->
@ -1004,9 +999,9 @@ as <xliff:g id="filename">%s</xliff:g>.</string>
<!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
<string name="account_settings_sync_contacts_summary">Sync contacts for this account</string>
<!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
<string name="account_settings_sync_calendar_enable">Sync Calendar</string>
<string name="account_settings_sync_calendar_enable">Sync calendar</string>
<!-- On settings screen, sync calendar summary text [CHAR LIMIT=35] -->
<string name="account_settings_sync_calendar_summary">Sync calendar for this account</string>
<string name="account_settings_sync_calendar_summary">Sync calendar event for this account</string>
<!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
<string name="account_settings_sync_email_enable">Sync email</string>
<!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->