From e856dd47cf81b514a605d90edf10210904d2fa3a Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 24 Nov 2012 14:22:59 -0500 Subject: [PATCH] Tighten up some of our english language prose --- plugins/Android-PullToRefresh | 2 +- res/values/strings.xml | 90 +++++++++++++++++------------------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/plugins/Android-PullToRefresh b/plugins/Android-PullToRefresh index 3e6131365..cbd7ab815 160000 --- a/plugins/Android-PullToRefresh +++ b/plugins/Android-PullToRefresh @@ -1 +1 @@ -Subproject commit 3e61313651fb5c1ecef83009b56217bec9edc3c1 +Subproject commit cbd7ab815ad510921459c31364491dbbe7bf0377 diff --git a/res/values/strings.xml b/res/values/strings.xml index acbffb569..8688a55a0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -57,15 +57,15 @@ http://k9mail.googlecode.com/ The account \"%s\" will be removed from K-9 Mail. - All data for \"%s\" will be removed from K-9 Mail, but account settings will be retained. - All messages in \"%s\" will be removed from K-9 Mail, but account settings will be retained. + All local data for \"%s\" will be removed. Account settings will be retained. + Local copies of messages in \"%s\" will be removed. Account settings will be retained. K-9 doesn\'t have permission to access APG fully, please reinstall K-9 to fix that. - There is no suitable application to handle the import operation. Please install a file manager application from Google Play Store. + Please install a file manager to continue with this import. Open Play Store @@ -315,11 +315,11 @@ http://k9mail.googlecode.com/ Confirm actions Show a dialog whenever you perform selected actions - Delete (message view only) - Delete Starred (message view only) + Delete (in message view) + Delete Starred (in message view) Spam - Hide subject in notifications + Hide subject in notificationss Never When device is locked Always @@ -392,10 +392,10 @@ http://k9mail.googlecode.com/ %1$s additional internal storage Storage location - Expunge deleted messages + Erase deleted messages on server Immediately When polling - Only manually + Manually Auto-detect IMAP namespace IMAP path prefix @@ -514,29 +514,29 @@ http://k9mail.googlecode.com/ Sending mail - Quote original message when replying - When replying to messages, the original message is in your reply. + Quote message when replying + Include the original message is in your reply. Reply after quoted text - When replying to messages, the original message will appear above your reply. + The original message will appear above your reply. - Strip signature from quoted reply - When replying to messages, the signature of the quoted text will be stripped + Strip signatures on reply + Signatures will be removed from quoted messages Message Format - Plain Text (images and formatting will be removed) - HTML (images and formatting are preserved) - Automatic (plain text unless replying to an HTML message) + Plain Text (remove images and formatting) + HTML (keep images and formatting) + Automatic - Always show CC/BCC - Always show the CC/BCC text input fields + Always show Cc/Bcc + Read receipt Always request a read receipt Reply quoting style - Prefix (like Gmail, Pine) - Header (like Outlook, Yahoo!, Hotmail) + Prefix (like Gmail) + Header (like Outlook) General settings Display @@ -559,10 +559,10 @@ http://k9mail.googlecode.com/ Storage Account color - Choose the color of the account used in folder and account list + The accent color of this account used in folder and account list Notification LED color - Choose the color your device LED should blink for this account + The color your device LED should blink for this account Local folder size @@ -742,12 +742,12 @@ http://k9mail.googlecode.com/ 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. - If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page. - If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on au one mail settings page. - If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page. - If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page. - If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page. - If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page. + Be sure to enable POP3 on the Yahoo mail settings page. + Be sure to enable IMAP or POP3 on the au one mail settings page. + Be sure to enable IMAP or POP3 on the Naver mail settings page. + Be sure to enable IMAP or POP3 on the Hanmail(Daum) mail settings page. + Be sure to enable IMAP or POP3 on the Paran mail settings page. + Be sure to enable IMAP or POP3 on the Nate mail settings page. Unrecognized Certificate Accept Key @@ -779,8 +779,8 @@ http://k9mail.googlecode.com/ Display all except 2nd Class folders Signature position - Before quoted text - After quoted text + Before quoted message + After quoted message Dark Light Display @@ -795,7 +795,7 @@ http://k9mail.googlecode.com/ Theme Language - Single-column layout + Condensed layout Reformat HTML messages for smaller screens System default @@ -828,15 +828,15 @@ http://k9mail.googlecode.com/ Animation Use gaudy visual effects Gestures - Accept gesture control + Enable gesture control Volume key navigation - Flip through items using the volume controls - Message view - Various list views + + In message views + In list views Start in Unified Inbox - Show the Unified Inbox after startup + Show account size Turn off for faster display @@ -950,8 +950,8 @@ http://k9mail.googlecode.com/ Confirm deletion Do you want to delete this message? - Delete - Do not delete + Yes + No Confirm move to spam folder @@ -974,7 +974,7 @@ http://k9mail.googlecode.com/ Downloading attachment - Debug logging to Android logging system enabled + Debug logging enabled » › @@ -1072,9 +1072,9 @@ http://k9mail.googlecode.com/ 500 1000 Server search result limit - Search will stop after %s results have been found. + Search will stop after finding %s. Remote folder searching - Include body text in server search + Include messages text in server search Full text searches can be slow. Sending query to server Fetching %d results @@ -1087,11 +1087,11 @@ http://k9mail.googlecode.com/ Search messages on server Pull to search server… Release to search server… - Remote search is unavailable without network connectivity. + A network connection is required for server search. - Use background as (un)read indicator - Show read and unread messages with different background colors + Dim messages after reading + A grey background will show that a message has been read Threaded view - Collapse messages belonging to the same thread + Group messages by conversation