From 76e273e3c8e39a7e475ae53e2e08f59eeff38529 Mon Sep 17 00:00:00 2001 From: Claudia de Veaux Date: Wed, 7 Dec 2011 11:50:44 -0800 Subject: [PATCH] Edit to strings per UI text standards. * Used standard language ("Allows this app..." for permission descriptions. * Messages and toasts use ending punctuation. * Checkbox labels do not use ending punctuation. * Toast language should be cryptic. * Use "unsuccessful" instead of failed, or "Couldn\'t ...". * Use contractions. Bug: 5165745 Bug: 5162667 Bug: 5163232 Change-Id: I4417a4c7b06b278ceb2a61f61493842c9bf922e1 --- res/values/strings.xml | 71 ++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 471af09c5..5ba54529a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -19,12 +19,12 @@ Read email attachments - Allows this application to read your email + Allows the app to read your email attachments. Access email provider data - Allows this application to access your email + Allows the app to access your email database, including received messages, sent messages, usernames, and passwords. @@ -66,7 +66,7 @@ Delete - No quick responses + No quick responses. Discard @@ -315,7 +315,7 @@ [CHAR_LIMIT=32] --> Include text - You must add at least one recipient. + Add at least one recipient. Some email addresses are invalid. @@ -357,10 +357,10 @@ Attachment saved as %s. - Couldn\'t save the attachment. + Couldn\'t save attachment. - Note: One or more attachments in your + One or more attachments in your forwarded message will be downloaded prior to sending. Message @@ -495,7 +495,7 @@ as %s. - %s signin failed. + %s signin unsuccessful. Couldn\'t sign in @@ -555,7 +555,7 @@ as %s. Password - Send email from this account by default. + Send email from this account by default Manual setup @@ -590,7 +590,7 @@ as %s. - Your account is set up, and email is on its way! + Your account is set up and email is on its way! Give this account a name (optional) @@ -681,7 +681,7 @@ as %s. Security type - Require sign-in. + Require signin Username @@ -735,20 +735,16 @@ as %s. Every hour - Send email from this account by default. + Send email from this account by default - Notify me when email arrives. + Notify me when email arrives - Sync contacts from this account. - + Sync contacts from this account - Sync calendar from this account. - + Sync calendar from this account - Sync email from this account. - - + Sync email from this account + Automatically download attachments when connected to Wi-Fi @@ -774,9 +770,9 @@ as %s. Use account\'s default - Username or password incorrect. + Username or password is incorrect. - Username or password incorrect.\n(%s) + Username or password is incorrect.\n(%s) @@ -789,16 +785,15 @@ as %s. Client certificate is required. Connect to server with client certificate? + >A client certificate is required. Do you want to connect to the server with a client certificate? Certificate is invalid or inaccessible. + >The certificate is invalid or inaccessible. - The server responded with an error. Check your username and password - then try again. + The server responded with an error. Check your username and password, then try again. Can\'t connect to server. @@ -832,7 +827,7 @@ as %s. [CHAR LIMIT=none] --> The server %s 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? @@ -861,7 +856,7 @@ as %s. - Account \"%s\" cannot be synced due to security + Account \"%s\" can\'t be synced due to security requirements. @@ -878,7 +873,7 @@ as %s. Security policies have changed - Security policies cannot be + Security policies can\'t be met Device security @@ -908,15 +903,15 @@ as %s. Lock screen password expiring - You must change your lock screen PIN or password soon, or the data for - %s will be erased. Change it now? + You need to change your lock screen PIN or password soon, or the data for + %s will be erased. Do you want to change it now? Lock screen password expired The data for %s is being erased from your device. - You can restore it by changing your lock screen PIN or password. Change it now? + You can restore it by changing your lock screen PIN or password. Do you want to change it now? @@ -929,7 +924,7 @@ as %s. [CHAR_LIMIT=none] --> The username or password for %s is incorrect. - Update them now? + Do you want to update them now? Default account @@ -948,7 +943,7 @@ as %s. [CHAR LIMIT=50] --> Sync frequency, notifications, etc. - Notify in System bar when email arrives + Send notification when email arrives Inbox check frequency @@ -972,7 +967,7 @@ as %s. Attempt sync - Tap here to attempt to sync this account (i.e. if server settings have changed) + Touch here to sync this account Account name @@ -984,7 +979,7 @@ as %s. Quick responses - Edit text that you frequently insert when composing emails + Edit text that you frequently insert when composing email Append text to messages you send @@ -1004,9 +999,9 @@ as %s. Sync contacts for this account - Sync Calendar + Sync calendar - Sync calendar for this account + Sync calendar event for this account Sync email