From 46fe19c78f8a3b8fdfde53ea978dcaa46091dad5 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 18 Sep 2012 15:02:14 -0700
Subject: [PATCH] String capitalization updates

---
 api/res/values/strings.xml              | 34 +++++++++---------
 astrid/res/values/strings-actfm.xml     |  4 +--
 astrid/res/values/strings-backup.xml    | 26 +++++++-------
 astrid/res/values/strings-core.xml      | 48 ++++++++++++-------------
 astrid/res/values/strings-defaults.xml  | 22 ++++++------
 astrid/res/values/strings-ppack.xml     |  4 +--
 astrid/res/values/strings-premium.xml   |  2 +-
 astrid/res/values/strings-reminders.xml | 38 ++++++++++----------
 astrid/res/values/strings-voice.xml     |  8 ++---
 astrid/res/values/strings-welcome.xml   |  2 +-
 10 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index f03f58d67..8145ebc05 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -149,10 +149,10 @@
   <string name="SyP_progress_toast">Synchronizing...</string>
   
   <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sync &amp; Backup</string>  
+  <string name="SyP_label">Sync &amp; backup</string>  
 
   <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, Saved Data &amp; Local Backup</string>  
+  <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>  
 
   <!-- Error msg when io exception  -->
   <string name="SyP_ioerror">Connection Error! Check your Internet connection.</string>
@@ -165,32 +165,32 @@
   <!-- Sync status subtitle, %s-> status message -->
   <string name="sync_SPr_status_subtitle">Status: %s</string>
   <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Not Logged In</string>
+  <string name="sync_status_loggedout">Not logged in</string>
   <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Sync Ongoing...</string>
+  <string name="sync_status_ongoing">Sync ongoing...</string>
   <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last Sync:\n%s</string>
+  <string name="sync_status_success">Last sync:\n%s</string>
   <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Failed On: %s</string>
+  <string name="sync_status_failed">Failed on: %s</string>
   <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sync w/ Errors: %s</string>
+  <string name="sync_status_errors">Sync w/ errors: %s</string>
   <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Last Successful Sync: %s</string>
+  <string name="sync_status_failed_subtitle">Last successful sync: %s</string>
   <!-- Sync Status: never sync'd -->    
-  <string name="sync_status_never">Never Synchronized!</string>
+  <string name="sync_status_never">Never synchronized!</string>
 
   <!-- Options Group Label -->    
   <string name="sync_SPr_group_options">Options</string>
 
   <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Background Sync</string>
+  <string name="sync_SPr_interval_title">Background sync</string>
   <!-- Preference: Synchronization Interval Description (when disabled) -->
   <string name="sync_SPr_interval_desc_disabled">Background synchronization is disabled</string>    
   <!-- Preference: Synchronization Interval Description (%s => setting) -->
   <string name="sync_SPr_interval_desc">Currently set to: %s</string>
   
   <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Wifi Only Setting</string>    
+  <string name="sync_SPr_bgwifi_title">Wifi only setting</string>    
   <!-- Preference: Background Wifi Description (enabled) -->
   <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>    
   <!-- Preference: Background Wifi Description (disabled) -->
@@ -200,28 +200,28 @@
   <string name="sync_SPr_group_actions">Actions</string>
 
   <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synchronize Now</string>
+  <string name="sync_SPr_sync">Synchronize now</string>
   <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Log In &amp; Synchronize!</string>
+  <string name="sync_SPr_sync_log_in">Log in &amp; synchronize!</string>
   
   <!-- Sync: Prefix string before logged in identifier -->
   <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
   
   <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Status Report</string>
+  <string name="sync_SPr_last_error">Status report</string>
   
   <!-- Sync: last error click for more -->
   <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
   <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Send Report</string>
+  <string name="sync_SPr_send_report">Send report</string>
   
   <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Log Out</string>
+  <string name="sync_SPr_forget">Log out</string>
   <!-- Sync: Clear Data Description -->
   <string name="sync_SPr_forget_description">Clears all synchronization data</string>
 
   <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Log out / clear synchronization data?</string>
+  <string name="sync_forget_confirm">Log out/clear synchronization data?</string>
   
   <!-- Sync error: network connectivity problems. %s-> name of sync service-->
   <string name="sync_error_offline">There was a problem connecting to the network
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 39e24c00c..bc7a8b8de 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -308,8 +308,8 @@
       Are you sure you want to sync with Astrid.com?</string>
       
   <!-- account types -->
-  <string name="actfm_account_type">Account Type</string>
-  <string name="actfm_account_info">Account Info</string>
+  <string name="actfm_account_type">Account type</string>
+  <string name="actfm_account_info">Account info</string>
   <string name="actfm_account_info_summary">Status and options</string>
   <string name="account_type_title_not_logged_in">Sign up for a free account</string>
   <string name="account_type_summary_not_logged_in">Access tasks online, share lists and delegate</string>
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index c27f88db5..806f39f1f 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -19,19 +19,19 @@
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
     <string name="backup_status_success">Latest backup:\n%s</string>
     <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Last Backup Failed</string>
+    <string name="backup_status_failed">Last backup failed</string>
     <!-- Backup Status: error subtitle -->    
     <string name="backup_status_failed_subtitle">(tap to show error)</string>
     <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Never Backed Up!</string>
+    <string name="backup_status_never">Never backed up!</string>
 
     <!-- slide 48f/ 50e: Backup Options Group Label -->    
     <string name="backup_BPr_group_options">Options</string>
 
     <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Automatic Backups</string>
+    <string name="backup_BPr_auto_title">Automatic backups</string>
     <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatic Backups Disabled</string>    
+    <string name="backup_BPr_auto_disabled">Automatic backups disabled</string>    
     <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
     <string name="backup_BPr_auto_enabled">Backup will occur daily</string>
     
@@ -45,16 +45,16 @@
   <!-- ================================================= BackupActivity == -->
 
   <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Manage Backups</string>
+  <string name="backup_BAc_label">Manage backups</string>
 
   <!-- backup activity title -->
-  <string name="backup_BAc_title">Manage Your Backups</string>
+  <string name="backup_BAc_title">Manage your backups</string>
 
   <!-- backup activity import button -->
-  <string name="backup_BAc_import">Import Tasks</string>
+  <string name="backup_BAc_import">Import tasks</string>
 
   <!-- backup activity export button -->
-  <string name="backup_BAc_export">Export Tasks</string>
+  <string name="backup_BAc_export">Export tasks</string>
   
   <!-- backup activity cloud (Astrid.com) option -->
   <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
@@ -62,17 +62,17 @@
   <!-- ============================================== Importer / Exporter == -->
   
   <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Import Error</string>
+  <string name="backup_TXI_error">Import error</string>
     
-  <string name="export_toast">Backed Up %1$s to %2$s.</string>
+  <string name="export_toast">Backed up %1$s to %2$s.</string>
     
-  <string name="export_toast_no_tasks">No Tasks to Export.</string>
+  <string name="export_toast_no_tasks">No tasks to export.</string>
   
   <!-- Progress Dialog Title for exporting -->    
   <string name="export_progress_title">Exporting...</string>
   
   <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Restore Summary</string>
+  <string name="import_summary_title">Restore summary</string>
     
   <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
   <string name="import_summary_message">
@@ -98,6 +98,6 @@ File %1$s contained %2$s.\n\n
   <string name="DLG_error_sdcard_general">Cannot access your SD card!</string>
     
   <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Select a File to Restore</string>    
+  <string name="import_file_prompt">Select a file to restore</string>    
         
 </resources>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index c4ea7fa7a..2686705cc 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -581,7 +581,7 @@
   <string name="EPr_appearance_header">Appearance</string>
   
   <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, Widgets, Task Rows, Edit Screen</string>
+  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
   
   <!-- FAQ Preference title -->
   <string name="EPr_faq_title">FAQ</string>
@@ -590,10 +590,10 @@
   <string name="EPr_account_title">Account: %s</string>
 
   <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, About Astrid</string>
+  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
   
   <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Task List Size</string>
+  <string name="EPr_fontSize_title">Task list size</string>
   
   <!-- slide 32a: Preference: Show confirmation for smart reminders -->
   <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
@@ -605,21 +605,21 @@
   <string name="EPr_showEditToasts_title">Show task edit confirmations</string>
   
   <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show Notes In Task</string>
+  <string name="EPr_showNotes_title">Show notes in yask</string>
   <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Customize Task Edit Screen</string>
+  <string name="EPr_beastMode_title">Customize task edit screen</string>
   <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Customize the layout of the Task Edit Screen</string>
+  <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
   <!-- slide 35j -->
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
   <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the Task Edit Page</string>  
+  <string name="EPr_showNotes_desc_disabled">Notes will be accessible from the task edit screen</string>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
   
   <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compact Task Row</string>
+  <string name="EPr_compressTaskRows_title">Compact task row</string>
   <!-- slide 34j -->
   <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
   
@@ -635,28 +635,28 @@
   <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
   
   <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Auto-load Ideas Tab</string>
+  <string name="EPr_ideaAuto_title">Auto-load ideas tab</string>
   <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Web searches for Ideas tab will be performed when tab is clicked</string>
-  <string name="EPr_ideaAuto_desc_disabled">Web searches for Ideas tab will be performed only when manually requested</string>
+  <string name="EPr_ideaAuto_desc_enabled">Web searches for ideas tab will be performed when tab is clicked</string>
+  <string name="EPr_ideaAuto_desc_disabled">Web searches for ideas tab will be performed only when manually requested</string>
   
   <!-- Preferences: task row style -->
-  <string name="EPr_task_row_style_title_simple">Row Style: Simple</string>
-  <string name="EPr_task_row_style_title_legacy">Row Style: Original</string>
+  <string name="EPr_task_row_style_title_simple">Row style: Simple</string>
+  <string name="EPr_task_row_style_title_legacy">Row style: Original</string>
   <string name="EPr_task_row_style_summary_simple">Truncate title to one line with date and lists below</string>
   <string name="EPr_task_row_style_summary_legacy">Truncate title to two lines with date on right</string>
   
   <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Color Theme</string>
+  <string name="EPr_theme_title">Color theme</string>
   <!-- Preference: Theme Description (%s => value) -->
   <string name="EPr_theme_desc">Currently: %s</string>  
   <!-- Preference: Theme Description (android 1.6) -->
   <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
   <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget Theme</string>
+  <string name="EPr_theme_widget_title">Widget theme</string>
   
   <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
+  <string name="EPr_taskRowPrefs_title">Task row appearance</string>
   
   <!-- slide 33b/ 49e: Preference screen: Astrid Labs (experimental features)-->
   <string name="EPr_labs_header">Astrid Labs</string>
@@ -670,13 +670,13 @@
   <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
 
   <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Enable Third Party Add-ons</string>
+  <string name="EPr_third_party_addons">Enable third party add-ons</string>
   <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
   <!-- slide 49d -->
   <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
   
   <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Task Ideas</string>
+  <string name="EPr_ideas_tab_enabled">Task ideas</string>
   <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
   
   <!-- Preferences: calendar event start time -->
@@ -753,31 +753,31 @@
   <!-- ========================================== Task Management Settings == -->
 
   <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Manage Old Tasks</string>
+  <string name="EPr_manage_header">Manage old tasks</string>
   <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Delete Completed Tasks</string>
+  <string name="EPr_manage_delete_completed">Delete completed tasks</string>
   <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
   <!-- slide 47a -->
   <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one</string>
   <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
   <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Purge Deleted Tasks</string>
+  <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
   <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
   <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
   <!-- slide 47b-->
   <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered without backup file!</string>
   <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Clear All Data</string>
+  <string name="EPr_manage_clear_all">Clear all data</string>
   <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
 
   <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Delete Calendar Events for Completed Tasks</string>
+  <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>
   <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
   <string name="EPr_manage_delete_completed_gcal_summary"></string>
   <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
       
   <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Delete All Calendar Events for Tasks</string>
+  <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
   <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
   <string name="EPr_manage_delete_all_gcal_summary"></string>
   <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
diff --git a/astrid/res/values/strings-defaults.xml b/astrid/res/values/strings-defaults.xml
index e7b217b05..2f247b5c8 100644
--- a/astrid/res/values/strings-defaults.xml
+++ b/astrid/res/values/strings-defaults.xml
@@ -7,38 +7,38 @@
 <resources>
 
   <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">New Task Defaults</string>
-  <string name="EPr_defaults_summary">Importance, Due Date, Add to Calendar</string>
+  <string name="EPr_defaults_header">New task defaults</string>
+  <string name="EPr_defaults_summary">Importance, due date, add to calendar</string>
   
   <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Default Urgency</string>
+  <string name="EPr_default_urgency_title">Default urgency</string>
   <!-- Preference: Default Urgency Description (%s => setting) -->
   <string name="EPr_default_urgency_desc">Currently: %s</string>
   
   <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default Importance</string>
+  <string name="EPr_default_importance_title">Default importance</string>
   <!-- Preference: Default Importance Description (%s => setting) -->
   <string name="EPr_default_importance_desc">Currently: %s</string>
   
   <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Default Hide Until</string>
+  <string name="EPr_default_hideUntil_title">Default hide until</string>
   <!-- Preference: Default Hide Until Description (%s => setting) -->
   <string name="EPr_default_hideUntil_desc">Currently: %s</string>
   
   <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Default Reminders</string>
+  <string name="EPr_default_reminders_title">Default reminders</string>
   <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_desc">Currently: %s</string>
   
   <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Default Add To Calendar</string>
+  <string name="EPr_default_addtocalendar_title">Default add to calendar</string>
   <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
   <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the Google Calendar</string>
   <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
   <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
   
   <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Default Ring/Vibrate type</string>
+  <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
   <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_mode_desc">Currently: %s</string>
   
@@ -55,15 +55,15 @@
   <string-array name="EPr_default_urgency">
     <!-- urgency: labels for "Task Defaults" preference item. -->
     <!-- slide 41a-->
-    <item>No Deadline</item>
+    <item>No deadline</item>
     <!-- slide 41b -->
     <item>Today</item>
     <!-- slide 41c-->
     <item>Tomorrow</item>
     <!-- slide 41d -->
-    <item>Day After Tomorrow</item>
+    <item>Day after tomorrow</item>
     <!-- slide 41e -->
-    <item>Next Week</item>
+    <item>Next week</item>
   </string-array>
   
   <string-array name="EPr_default_hideUntil">
diff --git a/astrid/res/values/strings-ppack.xml b/astrid/res/values/strings-ppack.xml
index de6dd43c7..b235ee5d2 100644
--- a/astrid/res/values/strings-ppack.xml
+++ b/astrid/res/values/strings-ppack.xml
@@ -9,11 +9,11 @@
   <!-- ================================================== EditPreferences == -->
     
   <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium and Misc. Settings</string>
+  <string name="EPr_powerpack_header">Premium and misc. settings</string>
   <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous settings</string>
   
   <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonymous Usage Stats</string>
+  <string name="EPr_statistics_title">Anonymous usage stats</string>
   <!-- Preference: User Statistics (disabled) -->
   <string name="EPr_statistics_desc_disabled">No usage data will be reported</string>  
   <!-- slide 32f: Preference: User Statistics (enabled) -->
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index 733675834..f5f87db22 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -54,7 +54,7 @@
     <string name="file_dir_dialog_ok">Use this directory</string>
     <string name="file_dir_dialog_default">Reset to default</string>
     
-    <string name="p_files_dir">Premium Downloads Directory</string>
+    <string name="p_files_dir">Premium downloads directory</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Task attachments saved to: %s</string>
     <string name="p_files_dir_desc_default">Default directory</string>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 315ba547a..e6b7005e6 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -14,7 +14,7 @@
   <string name="TEA_reminders_group_label">Reminders</string>
 
   <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind Me:</string>
+  <string name="TEA_reminder_label">Remind me:</string>
 
   <!-- Task Edit: Reminder @ deadline -->  
   <string name="TEA_reminder_due">When task is due</string>
@@ -26,16 +26,16 @@
   <string name="TEA_reminder_randomly">Randomly once</string>
 
   <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Ring/Vibrate Type:</string>
+  <string name="TEA_reminder_alarm_label">Ring/vibrate type:</string>
 
   <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Ring Once</string>
+  <string name="TEA_reminder_mode_once">Ring once</string>
 
   <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Ring Five Times</string>
+  <string name="TEA_reminder_mode_five">Ring five times</string>
 
   <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Ring Until I Dismiss Alarm</string>
+  <string name="TEA_reminder_mode_nonstop">Ring until I dismiss alarm</string>
 
   <string-array name="TEA_reminder_random">
     <!-- random reminder choices for task edit page. -->
@@ -104,35 +104,35 @@
   <!-- ============================================= reminder preferences == -->
   
   <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Reminder Settings</string>
+  <string name="rmd_EPr_alerts_header">Reminder settings</string>
   <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
     
   <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Reminders Enabled?</string>
+  <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
   <!-- Reminder Preference Reminders Enabled Description (true) -->
   <string name="rmd_EPr_enabled_desc_true">Astrid reminders are enabled (this is normal)</string>
   <!-- Reminder Preference Reminders Enabled Description (false) -->
   <string name="rmd_EPr_enabled_desc_false">Astrid reminders will never appear on your phone</string>  
     
   <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Quiet Hours Start</string>
+  <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
   <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the "Vibrate on Alert" setting</string>
+  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the "Vibrate on alert" setting</string>
   <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
   <string name="rmd_EPr_quiet_hours_desc_none">Quiet hours is disabled</string>
   
   <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Quiet Hours End</string>
+  <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
   <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
   <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at %s</string>
 
   <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Default Reminder</string>
+  <string name="rmd_EPr_rmd_time_title">Default reminder</string>
   <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
   <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at %s</string>
 
   <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Notification Ringtone</string>
+  <string name="rmd_EPr_ringtone_title">Notification ringtone</string>
   <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
   <string name="rmd_EPr_ringtone_desc_custom">Custom ringtone has been set</string>
   <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
@@ -141,14 +141,14 @@
   <string name="rmd_EPr_ringtone_desc_default">Default ringtone will be used</string>
   
   <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Notification Persistence</string>
+  <string name="rmd_EPr_persistent_title">Notification persistence</string>
   <!-- Reminder Preference: Notification Persistence Description (true) -->
   <string name="rmd_EPr_persistent_desc_true">Notifications must be viewed individually to be cleared</string>
   <!-- Reminder Preference: Notification Persistence Description (false) -->
   <string name="rmd_EPr_persistent_desc_false">Notifications can be cleared with \"Clear All\" button</string>
   
   <!-- Reminder Preference: Notification Icon Title -->
-  <string name="rmd_EPr_notificon_title">Notification Icon Set</string>
+  <string name="rmd_EPr_notificon_title">Notification icon set</string>
   <!-- Reminder Preference: Notification Icon Description -->
   <string name="rmd_Epr_notificon_desc">Choose Astrid\'s notification bar icon</string>
 
@@ -160,35 +160,35 @@
   <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid will use the system setting for the volume</string>
 
   <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrate on Alert</string>
+  <string name="rmd_EPr_vibrate_title">Vibrate on alert</string>
   <!-- Reminder Preference: Vibrate Description (true) -->
   <string name="rmd_EPr_vibrate_desc_true">Astrid will vibrate when sending notifications</string>
   <!-- Reminder Preference: Vibrate Description (false) -->
   <string name="rmd_EPr_vibrate_desc_false">Astrid will not vibrate when sending notifications</string>
 
   <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Encouragements</string>
+  <string name="rmd_EPr_nagging_title">Astrid encouragements</string>
   <!-- Reminder Preference: Nagging Description (true) -->
   <string name="rmd_EPr_nagging_desc_true">Astrid will show up to give you an encouragement during reminders</string>
   <!-- Reminder Preference: Nagging Description (false) -->
   <string name="rmd_EPr_nagging_desc_false">Astrid will not give you any encouragement messages</string>
 
   <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Snooze Dialog HH:MM</string>
+  <string name="rmd_EPr_snooze_dialog_title">Snooze dialog HH:MM</string>
   <!-- Reminder Preference: Snooze Dialog Description (true) -->
   <string name="rmd_EPr_snooze_dialog_desc_true">Snooze by selecting new snooze time (HH:MM)</string>
   <!-- Reminder Preference: Nagging Description (false) -->
   <string name="rmd_EPr_snooze_dialog_desc_false">Snooze by selecting # days/hours to snooze</string>
   
   <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Random Reminders</string>
+  <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
   <!-- Reminder Preference: Default Reminders Setting (disabled) -->
   <string name="rmd_EPr_defaultRemind_desc_disabled">New tasks will have no random reminders</string>
   <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
   <string name="rmd_EPr_defaultRemind_desc">New tasks will remind randomly: %s</string>
   
   <!-- slide 39a: Defaults Title -->
-  <string name="rmd_EPr_defaults_header">New Task Defaults</string>
+  <string name="rmd_EPr_defaults_header">New task defaults</string>
   
   <string-array name="EPr_reminder_random">
     <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
diff --git a/astrid/res/values/strings-voice.xml b/astrid/res/values/strings-voice.xml
index bb57f86f0..3b8c9df8a 100644
--- a/astrid/res/values/strings-voice.xml
+++ b/astrid/res/values/strings-voice.xml
@@ -18,25 +18,25 @@
   <!-- Preference: Market is not available for this system -->
   <string name="EPr_marketUnavailable_dlg">Unfortunately the market is not available for your system.\nIf possible, try downloading voice search from another source.</string>
   <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Voice Input</string>
+  <string name="EPr_voiceInputEnabled_title">Voice input</string>
   <!-- slide 38a: Preference: voice button description (true) -->
   <string name="EPr_voiceInputEnabled_desc_enabled">Voice input button will be displayed in task list page</string>
   <!-- Preference: voice button description (false) -->
   <string name="EPr_voiceInputEnabled_desc_disabled">Voice input button will be hidden on task list page</string>
   <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Directly Create Tasks</string>
+  <string name="EPr_voiceInputCreatesTask_title">Directly create tasks</string>
   <!-- Preference: Task List Voice-creation description (true) -->
   <string name="EPr_voiceInputCreatesTask_desc_enabled">Tasks will automatically be created from voice input</string>
   <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
   <string name="EPr_voiceInputCreatesTask_desc_disabled">You can edit the task title after voice input finishes</string>
   <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Voice Reminders</string>
+  <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
   <!-- Preference: Voice reminders description (true) -->
   <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid will speak task names during task reminders</string>
   <!-- slide 38c: Preference: Voice reminders description (false) -->
   <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task reminders</string>    
   
   <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Voice Input Settings</string>
+  <string name="EPr_voice_header">Voice input settings</string>
     
 </resources>
diff --git a/astrid/res/values/strings-welcome.xml b/astrid/res/values/strings-welcome.xml
index e80d80f28..7f8b09544 100644
--- a/astrid/res/values/strings-welcome.xml
+++ b/astrid/res/values/strings-welcome.xml
@@ -8,7 +8,7 @@
   
   <string name="welcome_show_eula">Accept EULA to get started!</string>
   <!-- slide 30a-->
-  <string name="welcome_setting">Show Tutorial</string>
+  <string name="welcome_setting">Show tutorial</string>
   
   <string name="welcome_title_1">Welcome to Astrid!</string>