From 8a5ff997ea711d0e9f72ada280845190e48a066b Mon Sep 17 00:00:00 2001
From: Tim Su <tim@astrid.com>
Date: Wed, 27 Jun 2012 18:24:54 -0700
Subject: [PATCH] Update strings files with translation help comments provided
 by Jessie Tang

---
 api/res/values/strings.xml              |   8 +-
 astrid/res/values/strings-actfm.xml     |  26 ++---
 astrid/res/values/strings-backup.xml    |  14 +--
 astrid/res/values/strings-core.xml      | 147 +++++++++++++++---------
 astrid/res/values/strings-defaults.xml  |  77 ++++++++-----
 astrid/res/values/strings-filters.xml   |  16 +--
 astrid/res/values/strings-gcal.xml      |   2 +-
 astrid/res/values/strings-gtasks.xml    |   1 -
 astrid/res/values/strings-intro.xml     |  13 ++-
 astrid/res/values/strings-ppack.xml     |   6 +-
 astrid/res/values/strings-reminders.xml |  19 +--
 astrid/res/values/strings-repeat.xml    |  12 +-
 astrid/res/values/strings-rmilk.xml     |   1 -
 astrid/res/values/strings-tags.xml      |  16 +--
 astrid/res/values/strings-updates.xml   |   6 +-
 astrid/res/values/strings-voice.xml     |  14 +--
 astrid/res/values/strings-welcome.xml   |  82 ++++++++-----
 17 files changed, 273 insertions(+), 187 deletions(-)

diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index efc641443..52e43a5a4 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -83,19 +83,19 @@
     <item quantity="other">%d people</item>
   </plurals>
   
-  <!-- today -->
+  <!-- slide 10a, 12c: today -->
   <string name="today">Today</string>
   
   <!-- tomorrow -->
   <string name="tomorrow">Tomorrow</string>
   
-  <!-- today -->
+  <!-- yesterday -->
   <string name="yesterday">Yesterday</string>
   
-  <!-- tomorrow, abbreviated -->
+  <!-- slide 12c: tomorrow, abbreviated -->
   <string name="tmrw">Tmrw</string>
   
-  <!-- yesterday, abbreviated -->
+  <!-- slide 12c: yesterday, abbreviated -->
   <string name="yest">Yest</string>
   
   <!-- ================================================== Generic Dialogs == -->
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 7fc6d3fb0..2ace9f4e0 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -7,7 +7,7 @@
   <!-- People Editing Activity -->    
   <string name="EPE_action">Share</string>
   
-  <!-- task sharing dialog: assigned hint -->
+  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
   <string name="actfm_person_hint">Contact or Email</string>
   
   <!-- task sharing dialog: shared with hint -->
@@ -22,10 +22,10 @@
   <!-- warning before deleting a list you're the owner of -->
   <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?</string>
 
-  <!-- menu item to take a picture -->
+  <!-- slide 29a: menu item to take a picture -->
   <string name="actfm_picture_camera">Take a Picture</string>
 
-  <!-- menu item to select from gallery -->
+  <!-- slide 29b: menu item to select from gallery -->
   <string name="actfm_picture_gallery">Pick from Gallery</string>
   
   <!-- menu item to clear picture selection -->
@@ -46,7 +46,7 @@
   <!-- Cancel button for task view prompt -->
   <string name="actfm_view_task_cancel">Stay Here</string>
   
-  <!-- Title for the "My Shared Tasks" filter -->
+  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
   <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
   
   <!-- Empty list for the "My Shared Tasks" filter -->
@@ -91,7 +91,7 @@
   <!-- Tag Settings: tag owner value when there is no owner -->
   <string name="actfm_TVA_tag_owner_none">none</string>
 
-  <!-- Tag Settings: list collaborators label -->
+  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
   <string name="actfm_TVA_members_label">Shared With</string>
   
   <!-- Tag Settings: list collaborators hint -->
@@ -100,22 +100,22 @@
   <!-- Tag Settings: tag picture -->
   <string name="actfm_TVA_tag_picture">List Picture</string>
 
-  <!-- Tag Settings: silence notifications label -->
+  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
   <string name="actfm_TVA_silence_label">Silence Notifications</string>
   
   <!-- Tag Settings: list icon label -->
   <string name="actfm_TVA_list_icon_label">List Icon:</string>
   
-  <!-- Tag Settings: list description label -->
+  <!-- slide 25b/27d: Tag Settings: list description label -->
   <string name="actfm_TVA_tag_description_label">Description</string>
   
-  <!-- Tag Settings: list settings label -->
+  <!-- slide 28a: Tag Settings: list settings label -->
   <string name="actfm_TVA_tag_settings_label">Settings</string>
 
-  <!-- Tag Settings: list description hint -->
+  <!-- slide 25b: Tag Settings: list description hint -->
   <string name="actfm_TVA_tag_description_hint">Type a description here</string>
   
-  <!-- Tag Settings: list name hint -->
+  <!-- slide 25d: Tag Settings: list name hint -->
   <string name="actfm_TVA_tag_name_hint">Enter list name</string>
   
   <!-- Tag settings: login prompt from share-->
@@ -136,7 +136,7 @@
   <!-- task sharing dialog: assigned label -->
   <string name="actfm_EPA_assign_label">Who</string>
   
-  <!-- task sharing dialog: assigned label long version -->
+  <!-- slide 18a: task sharing dialog: assigned label long version -->
   <string name="actfm_EPA_assign_label_long">Who should do this?</string>
   
   <!-- task sharing dialog: assigned to me -->
@@ -145,10 +145,10 @@
   <!-- task sharing dialog: anyone -->
   <string name="actfm_EPA_unassigned">Unassigned</string>
   
-  <!-- task sharing dialog: choose a contact -->
+  <!-- slide 18c: task sharing dialog: choose a contact -->
   <string name="actfm_EPA_choose_contact">Choose a contact</string>
   
-  <!-- task sharing dialog: use task rabbit -->
+  <!-- slide 17a: task sharing dialog: use task rabbit -->
   <string name="actfm_EPA_task_rabbit">Outsource it!</string>
   
   <!-- task sharing dialog: custom email assignment -->
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index ba3b43e10..bae413968 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -6,10 +6,10 @@
   
   <!-- ================================================= BackupPreferences == -->
 
-    <!-- Backup Preferences Title -->    
+    <!-- slide 33c/48d: Backup Preferences Title -->    
     <string name="backup_BPr_header">Backups</string>
 
-    <!-- Backup: Status Header -->    
+    <!-- slide 48e/50c: Backup: Status Header -->    
     <string name="backup_BPr_group_status">Status</string>
     
     <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
@@ -18,17 +18,17 @@
     <string name="backup_status_failed">Last Backup Failed</string>
     <!-- Backup Status: error subtitle -->    
     <string name="backup_status_failed_subtitle">(tap to show error)</string>
-    <!-- Backup Status: never backed up -->    
+    <!-- slide 48a: Backup Status: never backed up -->    
     <string name="backup_status_never">Never Backed Up!</string>
 
-    <!-- Backup Options Group Label -->    
+    <!-- slide 48f/ 50e: Backup Options Group Label -->    
     <string name="backup_BPr_group_options">Options</string>
 
-    <!-- Preference: Automatic Backup Title -->    
+    <!-- slide 48b: Preference: Automatic Backup Title -->    
     <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>    
-    <!-- Preference: Automatic Backup Description (when enabled) -->
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
     <string name="backup_BPr_auto_enabled">Backup will occur daily</string>
     
     <!-- Preference screen restoring Tasks Help -->
@@ -38,7 +38,7 @@
   
   <!-- ================================================= BackupActivity == -->
 
-  <!-- backup activity label -->
+  <!-- slide 48c: backup activity label -->
   <string name="backup_BAc_label">Manage Backups</string>
 
   <!-- backup activity title -->
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 5742df960..9486c33b0 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -4,7 +4,7 @@
 
   <!-- ================================================== AndroidManifest == -->
 
-  <!-- Application Name (shown on home screen & in launcher) -->
+  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
   <string name="app_name">Astrid Tasks</string>
   
   <!-- permission title for READ_TASKS -->
@@ -58,9 +58,10 @@
   
   <!-- Dialog - dismiss -->
   <string name="DLG_dismiss">Dismiss</string>
-  
+
+  <!-- slide 20d -->
   <string name="DLG_ok">OK</string>
-  
+  <!-- slide 36g -->
   <string name="DLG_cancel">Cancel</string>
   
   <string name="DLG_more">More</string>
@@ -99,7 +100,7 @@
   
   <!-- ================================================= TaskListActivity == -->
   
-  <!-- Task List: Displayed instead of list when no items present -->    
+  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
   <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
   
   <!-- Task List: Displayed instead of list when no items present in people view (%s-> person's name) -->    
@@ -132,7 +133,7 @@
   <!-- Menu: Settings -->    
   <string name="TLA_menu_settings">Settings</string>
   
-  <!-- Menu: Support -->
+  <!-- slide 30b: Menu: Support -->
   <string name="TLA_menu_support">Support</string>
   
   <!-- Search Label-->
@@ -141,7 +142,7 @@
   <!-- Window title for displaying Custom Filter -->
   <string name="TLA_custom">Custom</string>
   
-  <!-- Quick Add Edit Box Hint-->
+  <!-- slide 8d: Quick Add Edit Box Hint-->
   <string name="TLA_quick_add_hint">Add a task</string>
   
   <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
@@ -186,7 +187,7 @@
       <item>medium priority</item>
       <item>low priority</item>
   </string-array>
-  
+  <!-- slide 22a -->
   <string name="TLA_all_activity">All Activity</string>
   
   <!-- ====================================================== TaskAdapter == -->
@@ -200,10 +201,10 @@
   <!-- Displayed when adapter is flung (scrolled quickly) -->
   <string name="TAd_flingText"></string>
   
-  <!-- indicates task was completed. %s => date or time ago -->
+  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
   <string name="TAd_completed">Finished\n%s</string>
   
-  <!-- Action Button: edit task -->
+  <!-- slide 15a: Action Button: edit task -->
   <string name="TAd_actionEditTask">Edit</string>
   
   <!-- Context Item: edit task -->
@@ -223,10 +224,10 @@
   
   <!-- ============================================== SortSelectionDialog == -->
   
-  <!-- Sort Selection: dialog title -->    
+  <!-- slide 23a: Sort Selection: dialog title -->    
   <string name="SSD_title">Sort, Subtasks, and Hidden</string>
   
-  <!-- Hidden: title -->
+  <!-- slide 23h:  Hidden: title -->
   <string name="SSD_hidden_title">Hidden Tasks</string>
   
   <!-- Hidden Task Selection: show completed tasks -->    
@@ -241,28 +242,28 @@
   <!-- Sort Selection: drag with subtasks -->
   <string name="SSD_sort_drag">Drag &amp; Drop with Subtasks</string>
   
-  <!-- Sort Selection: smart sort -->
+  <!-- slide 23b: Sort Selection: smart sort -->
   <string name="SSD_sort_auto">Astrid Smart Sort</string>
   
-  <!-- Sort Selection: sort by alpha -->
+  <!-- slide 23e: Sort Selection: sort by alpha -->
   <string name="SSD_sort_alpha">By Title</string>
   
-  <!-- Sort Selection: sort by due date -->
+  <!-- slide 23c: Sort Selection: sort by due date -->
   <string name="SSD_sort_due">By Due Date</string>
   
-  <!-- Sort Selection: sort by importance -->
+  <!-- slide 23d: Sort Selection: sort by importance -->
   <string name="SSD_sort_importance">By Importance</string>
   
-  <!-- Sort Selection: sort by modified date -->
+  <!-- slide 23f: Sort Selection: sort by modified date -->
   <string name="SSD_sort_modified">By Last Modified</string>
   
-  <!-- Sort Selection: reverse -->
+  <!-- slide 23g: Sort Selection: reverse -->
   <string name="SSD_sort_reverse">Reverse Sort</string>
   
-  <!-- Sort Button: sort temporarily -->
+  <!-- slide 23j: Sort Button: sort temporarily -->
   <string name="SSD_save_temp">Just Once</string>
   
-  <!-- Sort Button: sort permanently -->
+  <!-- slide 23i: Sort Button: sort permanently -->
   <string name="SSD_save_always">Always</string>
   
   <!-- =============================================== FilterListActivity == -->
@@ -285,7 +286,7 @@
   <!-- Menu: Help -->    
   <string name="FLA_menu_help">Help</string>
   
-  <!-- Create Shortcut Dialog Title -->    
+  <!-- slide 28c: Create Shortcut Dialog Title -->    
   <string name="FLA_shortcut_dialog_title">Create Desktop Shortcut</string>
   
   <!-- Create Shortcut Dialog (asks to name shortcut) -->    
@@ -303,7 +304,7 @@
   <!-- Menu: new filter -->
   <string name="FLA_new_filter">New Filter</string>
   
-  <!-- Button: new list -->
+  <!-- slide 10e: Button: new list -->
   <string name="FLA_new_list">New List</string>
   
   <!-- Alert when creating a shortcut without selecting a filter -->
@@ -326,9 +327,6 @@
   <!-- Task title hint (displayed when edit box is empty) -->
   <string name="TEA_title_hint">Task Summary</string>
   
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Importance</string>
-  
   <!-- Task urgency label -->
   <string name="TEA_urgency_label">Deadline</string>
   
@@ -347,7 +345,7 @@
   <!-- Task editing data being loaded label -->
   <string-array name="TEA_loading"><item>Loading...</item></string-array>
   
-  <!-- Task note label -->
+  <!-- slide 16c: Task note label -->
   <string name="TEA_note_label">Notes</string>
   
   <!-- Task note hint -->
@@ -383,17 +381,17 @@
   <!-- Toast: task was deleted -->
   <string name="TEA_onTaskDelete">Task deleted!</string>
   
-  <!-- Task edit tab: activity -->
+  <!-- slide 15b: Task edit tab: activity -->
   <string name="TEA_tab_activity">Activity</string>
   
-  <!-- Task edit tab: more editing settings -->
+  <!-- slide 15e:  Task edit tab: more editing settings -->
   <string name="TEA_tab_more">Details</string>
   
-  <!-- Task edit tab: web services -->
+  <!-- slide 15d: Task edit tab: web services -->
   <string name="TEA_tab_web">Ideas</string>
   
   <string-array name="TEA_urgency">
-      <!-- urgency: labels for edit page. item #4 -> auto filled -->
+      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
       <item>No deadline</item>
       <item>Specific Day</item>
       <item>Today</item>
@@ -417,15 +415,28 @@
   
   <!-- Task edit control set descriptors -->
   <string name="TEA_control_title">Task Title</string>
+
+  <!-- slide 9b/35i -->
   <string name="TEA_control_who">Who</string>
+
+  <!-- slide 9c/ 35a -->
   <string name="TEA_control_when">When</string>
+  <!-- slide 35b -->
   <string name="TEA_control_more_section">----Details----</string>
+  <!-- slide 16a/35c -->
   <string name="TEA_control_importance">Importance</string>  
-  <string name="TEA_control_lists">Lists</string>
+  <!-- slide 16b/35d -->
+  <string name="TEA_control_lists">Lists</string>  
+  <!-- slide 16c/35e -->
   <string name="TEA_control_notes">Notes</string>  
-  <string name="TEA_control_files">Files</string>
+
+  <!-- slide 16e / slide 35g-->
   <string name="TEA_control_reminders">Reminders</string>
+
+  <!-- slide 16f -->
   <string name="TEA_control_timer">Timer Controls</string>
+
+  <!-- slide 16g -->
   <string name="TEA_control_share">Share With Friends</string>
   
   <string name="hide_until_prompt">Show in my list</string>
@@ -439,7 +450,7 @@
   <!-- More row -->
   <string name="TEA_more">More</string>
   
-  <!-- Text when no activity to show -->
+  <!-- slide 15c: Text when no activity to show -->
   <string name="TEA_no_activity">No Activity to Show.</string>
   
   <!-- Text to load more activity -->
@@ -460,7 +471,7 @@
   
   <!-- ============================================= IntroductionActivity == -->
   
-  <!-- Introduction Window title -->
+  <!-- slide 1a: Introduction Window title -->
   <string name="InA_title">Welcome to Astrid!</string>
   
   <!-- Button to agree to EULA -->
@@ -498,7 +509,7 @@
   <!-- Missed call: preference title -->
   <string name="MCA_missed_calls_pref_title">Field missed calls</string>
 
-  <!-- Missed call: preference description -->
+  <!-- slide 49c: Missed call: preference description -->
   <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
   <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
 
@@ -540,81 +551,91 @@
   
   <!-- ================================================== EditPreferences == -->
     
-  <!-- Preference Window Title -->
+  <!-- slide 31g: Preference Window Title -->
   <string name="EPr_title">Astrid: Settings</string>
   
+  <!-- slide 46a -->
   <string name="EPr_deactivated">deactivated</string>
 
-  <!-- Preference Category: Appearance Title -->
+  <!-- slide 30i: Preference Category: Appearance Title -->
   <string name="EPr_appearance_header">Appearance</string>
   
-  <!-- Preference: Task List Font Size Title -->
+  <!-- slide 34a: Preference: Task List Font Size Title -->
   <string name="EPr_fontSize_title">Task List Size</string>
   
-  <!-- Preference: Show confirmation for smart reminders -->
+  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
   <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
   
-  <!-- Preference: Task List Font Size Description -->                                                                                                                                                  
+  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
   <string name="EPr_fontSize_desc">Font size on the main listing page</string>  
   
-  <!-- Preference: Task List Show Notes -->
+  <!-- slide 34c: Preference: Task List Show Notes -->
   <string name="EPr_showNotes_title">Show Notes In Task</string>
-  <!-- Preference: Beast mode (auto-expand edit page) -->
+  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
   <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>
+  <!-- slide 35j -->
   <string name="EPr_beastMode_reset">Reset to defaults</string>
       
-  <!-- Preference: Task List Show Notes Description (disabled) -->
+  <!-- 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>  
   <!-- Preference: Task List Show Notes Description (enabled) -->
   <string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
   
-  <!-- Preferences: Allow task rows to compress to size of task -->
+  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
   <string name="EPr_compressTaskRows_title">Compact Task Row</string>
+  <!-- slide 34j -->
   <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
   
-  <!-- Preferences: Use legacy importance and checkbox style -->
+  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
   <string name="EPr_userLegacyImportance_title">Use legacy importance style</string>
+  <!-- slide 34k-->
   <string name="EPr_userLegacyImportance_desc">Use legacy importance style</string>
   
-  <!-- Preferences: Wrap task titles to two lines -->
+  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
   <string name="EPr_fullTask_title">Show full task title</string>
   <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
+  <!-- slide 34h -->
   <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
   
-  <!-- Preferences: Auto-load Ideas Tab -->
+  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
   <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>
   
-  <!-- Preference: Theme -->
+  <!-- slide 30f/ 36f: Preference: Theme -->
   <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>
   
-  <!-- Preference screen: all task row settings -->
+  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
   <string name="EPr_taskRowPrefs_title">Task Row Appearance</string>
   
-  <!-- Preference screen: Astrid Labs (experimental features)-->
+  <!-- slide 33b/ 49e: Preference screen: Astrid Labs (experimental features)-->
   <string name="EPr_labs_header">Astrid Labs</string>
+  <!-- slide 33f -->
   <string name="EPr_labs_desc">Try and configure experimental features</string>
   
   <!-- Preference: swipe between lists performance -->
   <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
   <string name="EPr_swipe_lists_performance_subtitle">Controls the memory performance of swipe between lists</string>
   
-  <!-- Preferences: use the system contact picker for task assignment -->
+  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
   <string name="EPr_use_contact_picker">Use contact picker</string>
+  <!-- slide 49b -->
   <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
   <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
 
-  <!-- Preferences: Third party addons -->
+  <!-- slide 49i: Preferences: Third party addons -->
   <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 -->
@@ -631,6 +652,7 @@
   </string-array>
   
   <string-array name="EPr_swipe_lists_performance_desc">
+  <!-- slide 49a -->
       <item>Swipe between lists is disabled</item>
       <item>Slower performance</item>
       <item>Default setting</item>
@@ -649,14 +671,20 @@
     
   <string-array name="EPr_themes">
     <!-- theme_settings: labels for Theme preference menu -->
+    <!-- slide 36a-->
     <item>Day - Blue</item>
+    <!-- slide 36b -->
     <item>Day - Red</item>
+    <!-- slide 36c -->
     <item>Night</item>
+    <!-- slide 36d -->
     <item>Transparent (White Text)</item>
+    <!-- slide 36e -->
     <item>Transparent (Black Text)</item>
   </string-array>
   
   <string-array name="EPr_themes_widget">
+    <!-- slide 32i / 37a-->
     <item>Same as app</item>
     <item>Day - Blue</item>
     <item>Day - Red</item>
@@ -668,24 +696,31 @@
   
   <!-- ========================================== Task Management Settings == -->
 
-  <!-- Preference Screen Header: Old Task Management -->
+  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
   <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_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_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_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_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_message">Do you really want to delete all your events for tasks?</string>
   <string name="EPr_manage_delete_all_gcal_summary"></string>
@@ -727,18 +762,18 @@
 
   <!-- ============================================================= About == -->
   
-  <!-- Title of "About" option in settings -->
+  <!-- slide 30h: Title of "About" option in settings -->
   <string name="p_about">About Astrid</string>
   
   <!-- About text (%s => current version)-->
-<string name="p_about_text">Current version: %s\n\n
+  <string name="p_about_text">Current version: %s\n\n
 
 Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
 
   <!-- Title of "Help" option in settings -->
   <string name="p_help">Support</string>
   
-  <!-- Title of "Forums" option in settings -->
+  <!-- slide 30c: Title of "Forums" option in settings -->
   <string name="p_forums">Forums</string>
   
   <!-- ============================================================= Misc == -->
diff --git a/astrid/res/values/strings-defaults.xml b/astrid/res/values/strings-defaults.xml
index 6dde0f2a5..c8814090b 100644
--- a/astrid/res/values/strings-defaults.xml
+++ b/astrid/res/values/strings-defaults.xml
@@ -1,76 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-   <!-- Preference Category: Defaults Title -->
+  <!-- slide 32g: Preference Category: Defaults Title -->
   <string name="EPr_defaults_header">New Task Defaults</string>
   
-  <!-- Preference: Default Urgency Title -->
+  <!-- slide 41f:  Preference: Default Urgency Title -->
   <string name="EPr_default_urgency_title">Default Urgency</string>
   <!-- Preference: Default Urgency Description (%s => setting) -->
   <string name="EPr_default_urgency_desc">Currently: %s</string>
   
-  <!-- Preference: Default Importance Title -->
+  <!-- slide 40a: Preference: Default Importance Title -->
   <string name="EPr_default_importance_title">Default Importance</string>
   <!-- Preference: Default Importance Description (%s => setting) -->
   <string name="EPr_default_importance_desc">Currently: %s</string>
   
-  <!-- Preference: Default Hide Until Title -->
+  <!-- slide 42e: Preference: Default Hide Until Title -->
   <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>
   
-  <!-- Preference: Default Reminders Title -->
+  <!-- slide 43e: Preference: Default Reminders Title -->
   <string name="EPr_default_reminders_title">Default Reminders</string>
   <!-- Preference: Default Reminders Description (%s => setting) -->
   <string name="EPr_default_reminders_desc">Currently: %s</string>
   
-  <!-- Preference: Default Add To Calendar Title -->
+  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
   <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>
   
-  <!-- Reminder Mode Preference: Default Reminders Duration -->
+  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
   <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>
   
   <string-array name="EPr_default_importance">
-      <!-- importance: labels for "Task Defaults" preference item. -->
-      <item>!!! (Highest)</item>
-      <item>!!</item>
-      <item>!</item>
-      <item>o (Lowest)</item>
+    <!-- importance: labels for "Task Defaults" preference item. -->
+    <!-- slide 40b -->
+    <item>!!! (Highest)</item>
+    <item>!!</item>
+    <item>!</item>
+    <!-- slide 40c -->
+    <item>o (Lowest)</item>
   </string-array>
   
   <string-array name="EPr_default_urgency">
-      <!-- urgency: labels for "Task Defaults" preference item. -->
-      <item>No Deadline</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>Day After Tomorrow</item>
-      <item>Next Week</item>
+    <!-- urgency: labels for "Task Defaults" preference item. -->
+    <!-- slide 41a-->
+    <item>No Deadline</item>
+    <!-- slide 41b -->
+    <item>Today</item>
+    <!-- slide 41c-->
+    <item>Tomorrow</item>
+    <!-- slide 41d -->
+    <item>Day After Tomorrow</item>
+    <!-- slide 41e -->
+    <item>Next Week</item>
   </string-array>
   
   <string-array name="EPr_default_hideUntil">
-      <!-- hideUntil: labels for "Task Defaults" preference item. -->
-      <item>Don\'t hide</item>
-      <item>Task is due</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
+    <!-- hideUntil: labels for "Task Defaults" preference item. -->
+    <!-- slide 42a -->
+    <item>Don\'t hide</item>
+    <!-- slide 42b -->
+    <item>Task is due</item>
+    <!-- slide 42c -->
+    <item>Day before due</item>
+    <!-- slide 42d-->
+    <item>Week before due</item>
   </string-array>
   
   <string-array name="EPr_default_reminders">
-      <!-- reminders: labels for "Task Defaults" preference item. -->
-      <item>No deadline reminders</item>
-      <item>At deadline</item>
-      <item>When overdue</item>
-      <item>At deadline or overdue</item>
+    <!-- reminders: labels for "Task Defaults" preference item. -->
+    <!-- slide 43a -->
+    <item>No deadline reminders</item>
+    <!-- slide 43b -->
+    <item>At deadline</item>
+    <!-- slide 43c -->
+    <item>When overdue</item>
+    <!-- slide 43d -->
+    <item>At deadline or overdue</item>
   </string-array>
   
-    <string-array name="EPr_default_addtocalendar">
-      <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-      <item>@string/EPr_deactivated</item>
+  <string-array name="EPr_default_addtocalendar">
+    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+    <item>@string/EPr_deactivated</item>
   </string-array>      
 </resources>
diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 3aa2713e8..a3b25d910 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -12,10 +12,10 @@
     <!-- Search Filter -->
     <string name="BFE_Search">Search...</string>
     
-    <!-- Recently Modified -->
+    <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Recently Modified</string>
     
-    <!-- I've assigned -->
+    <!-- slide 10c: I've assigned -->
     <string name="BFE_Assigned">I\'ve Assigned</string>
     
     <!-- Build Your Own Filter -->
@@ -29,16 +29,16 @@
 
     <!-- =========================================== CustomFilterActivity == -->
     
-    <!-- Build Your Own Filter Activity Title-->
+    <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Custom Filter</string>
     
-    <!-- Filter Name edit box hint (if user types here, filter will be saved) -->
+    <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Name this filter to save it...</string>
     
     <!-- Filter Name default for copied filters (%s => old filter name) -->
     <string name="CFA_filterName_copy">Copy of %s</string>
     
-    <!-- Filter Starting Universe: all tasks -->
+    <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Active Tasks</string>
     
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
@@ -56,15 +56,15 @@
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Delete Row</string>
     
-    <!-- Filter Screen Help Text -->
+    <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">This screen lets you create a new filters. Add 
     criteria using the button below, short or long-press them to adjust, and
     then click \"View\"!</string>
     
-    <!-- Filter Button: add new -->
+    <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Add Criteria</string>
     
-    <!-- Filter Button: view without saving -->
+    <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">View</string>
     
     <!-- Filter Button: save & view filter -->
diff --git a/astrid/res/values/strings-gcal.xml b/astrid/res/values/strings-gcal.xml
index 9492cf257..967eb9417 100644
--- a/astrid/res/values/strings-gcal.xml
+++ b/astrid/res/values/strings-gcal.xml
@@ -12,7 +12,7 @@
   <!-- Label for adding task to calendar -->
   <string name="gcal_TEA_calendar_label">Calendar Integration:</string>
 
-  <!-- Label for adding task to calendar -->
+  <!-- slide 21c: Label for adding task to calendar -->
   <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
   
   <!-- Label when calendar event already exists -->
diff --git a/astrid/res/values/strings-gtasks.xml b/astrid/res/values/strings-gtasks.xml
index e9754ebb3..17ef80d52 100644
--- a/astrid/res/values/strings-gtasks.xml
+++ b/astrid/res/values/strings-gtasks.xml
@@ -109,4 +109,3 @@
       Are you sure you want to sync with Google Tasks?</string>
         
 </resources>
-
diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml
index d20cb6205..ee487577c 100644
--- a/astrid/res/values/strings-intro.xml
+++ b/astrid/res/values/strings-intro.xml
@@ -5,16 +5,16 @@
   <!-- NEW USER EXPERIENCE -->
   
   <!-- help bubbles -->
-  <!-- Shown the first time a user sees the task list activity -->
+  <!-- slide 8c: Shown the first time a user sees the task list activity -->
   <string name="help_popover_add_task">Start by adding a task or two</string>
 
   <!-- Shown the first time a user adds a task to a list -->  
   <string name="help_popover_tap_task">Tap task to edit and share</string>
   
-  <!-- Shown the first time a user sees the list activity -->
+  <!-- slide 14a: Shown the first time a user sees the list activity -->
   <string name="help_popover_list_settings">Tap to edit or share this list</string>
   
-  <!-- Shown the first time a user sees the list settings tab -->
+  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
   <string name="help_popover_collaborators">People you share with can help you build your list or finish tasks</string>
   
   <!-- Shown after user adds a task on tablet-->
@@ -26,18 +26,21 @@
   <string name="help_popover_when_shortcut">Tap this shortcut to quick select date and time</string>
   
   <string name="help_popover_when_row">Tap anywhere on this row to access options like repeat</string>
-      
+  
   <!-- Login activity -->
   <string name="welcome_login_title">Welcome to Astrid!</string>
   
   <string name="welcome_login_intro"></string>
   
+  <!-- slide 7b -->
   <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
   
   <string name="welcome_login_tos_link">\"Terms of Service\"</string>
   
+  <!-- slide 7e -->
   <string name="welcome_login_pw">Login with Username/Password</string>
-  
+
+  <!-- slide 7f -->
   <string name="welcome_login_later">Connect Later</string>
   
   <string name="welcome_login_confirm_later_title">Why not sign in?</string>
diff --git a/astrid/res/values/strings-ppack.xml b/astrid/res/values/strings-ppack.xml
index 6af692cc5..45035fd8d 100644
--- a/astrid/res/values/strings-ppack.xml
+++ b/astrid/res/values/strings-ppack.xml
@@ -4,14 +4,14 @@
 
   <!-- ================================================== EditPreferences == -->
     
-  <!-- Preference Category: Power Pack -->
+  <!-- slide 32j: Preference Category: Power Pack -->
   <string name="EPr_powerpack_header">Astrid Power Pack</string>
   
-  <!-- Preference: Anonymous User Statistics -->
+  <!-- slide 32e: Preference: Anonymous User Statistics -->
   <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>  
-  <!-- Preference: User Statistics (enabled) -->
+  <!-- slide 32f: Preference: User Statistics (enabled) -->
   <string name="EPr_statistics_desc_enabled">Help us make Astrid better by sending anonymous usage data</string>
       
 </resources>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 6d154f591..a700542e1 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -24,13 +24,13 @@
   <!-- Task Edit: Reminder alarm clock label -->  
   <string name="TEA_reminder_alarm_label">Ring/Vibrate Type:</string>
 
-  <!-- Task Edit: Reminder mode: ring once -->  
+  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
   <string name="TEA_reminder_mode_once">Ring Once</string>
 
-  <!-- Task Edit: Reminder mode: ring five times -->  
+  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
   <string name="TEA_reminder_mode_five">Ring Five Times</string>
 
-  <!-- Task Edit: Reminder mode: ring nonstop -->  
+  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
   <string name="TEA_reminder_mode_nonstop">Ring Until I Dismiss Alarm</string>
 
   <string-array name="TEA_reminder_random">
@@ -95,7 +95,7 @@
   </string-array>
   <!-- ============================================= reminder preferences == -->
   
-  <!-- Reminder Preference Screen Title -->
+  <!-- slide 33d: Reminder Preference Screen Title -->
   <string name="rmd_EPr_alerts_header">Reminder Settings</string>
     
   <!-- Reminder Preference: Reminders Enabled Title -->
@@ -171,23 +171,28 @@
   <!-- Reminder Preference: Nagging Description (false) -->
   <string name="rmd_EPr_snooze_dialog_desc_false">Snooze by selecting # days/hours to snooze</string>
   
-  <!-- Reminder Preference: Default Reminders Title -->
+  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
   <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>
   
-  <!-- Defaults Title -->
+  <!-- slide 39a: Defaults Title -->
   <string name="rmd_EPr_defaults_header">New Task Defaults</string>
   
   <string-array name="EPr_reminder_random">
-    <!-- Reminder Preference: random reminder choices for preference page. -->
+    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
     <item>disabled</item>
+    <!-- slide 44b -->
     <item>hourly</item>
+    <!-- slide 44c -->
     <item>daily</item>
+    <!-- slide 44d-->
     <item>weekly</item>
+    <!-- slide 44e-->
     <item>bi-weekly</item>
+    <!-- slide 44f -->
     <item>monthly</item>
     <item>bi-monthly</item>
   </string-array>
diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml
index 32b525ba5..8bd8dc086 100644
--- a/astrid/res/values/strings-repeat.xml
+++ b/astrid/res/values/strings-repeat.xml
@@ -10,17 +10,18 @@
   <!-- repeating plugin description -->
   <string name="repeat_plugin_desc">Allows tasks to repeat</string>
   
-  <!-- checkbox for turning on/off repeats -->
+  <!-- slide 20a: checkbox for turning on/off repeats -->
   <string name="repeat_enabled">Repeats</string>
   
-  <!-- button for "every x" part of repeat (%d -> repeat value)  -->
+  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
   <string name="repeat_every">Every %d</string>
   
   <!-- hint when opening repeat interval -->
   <string name="repeat_interval_prompt">Repeat Interval</string>
   
+  <!-- slide 19b-->
   <string name="repeat_never">Make Repeating?</string>
-  
+  <!-- slide 20f-->
   <string name="repeat_dont">Don\'t repeat</string>
       
   <string-array name="repeat_interval_short">
@@ -35,7 +36,7 @@
   
   
   <string-array name="repeat_interval">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
     <item>Day(s)</item>
     <item>Week(s)</item>
     <item>Month(s)</item>
@@ -45,8 +46,9 @@
   </string-array>
   
   <string-array name="repeat_type">
-    <!-- repeat type (date to repeat from) -->
+    <!-- slide 20c: repeat type (date to repeat from) -->
     <item>from due date</item>
+    <!-- slide 20c -->
     <item>from completion date</item>
   </string-array>
   
diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml
index e2ed8184b..f23d8c96f 100644
--- a/astrid/res/values/strings-rmilk.xml
+++ b/astrid/res/values/strings-rmilk.xml
@@ -63,4 +63,3 @@ Error Message: %s
     or maybe RTM servers (status.rememberthemilk.com), for possible solutions.</string>
             
 </resources>
-
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index 3a82a01b3..387067fa6 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -12,7 +12,7 @@
   <!-- Tags label long version -->
   <string name="TEA_tags_label_long">Put task on one or more lists</string>
   
-  <!-- Tags none -->
+  <!-- slide 16h: Tags none -->
   <string name="TEA_tags_none">None</string>
 
   <!-- Tags hint -->
@@ -28,16 +28,16 @@
   
   <!-- ========================================================== Extras == -->
   
-    <!-- Context Item: show tag -->
+  <!-- Context Item: show tag -->
   <string name="TAd_contextFilterByTag">Show List</string>
   
-    <!-- Dialog: new list -->
+  <!-- slide 25a: Dialog: new list -->
   <string name="tag_new_list">New List</string>
   
-    <!-- Dialog: list saved -->
+  <!-- Dialog: list saved -->
   <string name="tag_list_saved">List Saved</string>
   
-    <!-- Dialog: task created without title -->
+  <!-- Dialog: task created without title -->
   <string name="tag_no_title_error">Please enter a name for this list first!</string>
   
   <!-- ========================================================== Filters == -->
@@ -57,13 +57,13 @@
   <!-- filter header for tags which have no active tasks -->
   <string name="tag_FEx_category_inactive">Inactive</string>
   
-  <!-- filter for untagged tasks -->
+  <!-- slide 10d: filter for untagged tasks -->
   <string name="tag_FEx_untagged">Not in any List</string>
   
   <!-- clarifying title for people who have Google and Astrid lists -->
   <string name="tag_FEx_untagged_w_astrid">Not in an Astrid List</string>
   
-  <!-- %s => tag name -->
+  <!-- slide 27a: %s => tag name -->
   <string name="tag_FEx_name">List: %s</string>
 
   <!-- context menu option to rename a tag -->
@@ -110,7 +110,7 @@
   <!-- Delete button for tag settings -->
   <string name="tag_delete_button">Delete List</string>
   
-  <!-- Leave button for tag settings -->
+  <!-- slide 28d: Leave button for tag settings -->
   <string name="tag_leave_button">Leave This List</string>
 
 </resources>
diff --git a/astrid/res/values/strings-updates.xml b/astrid/res/values/strings-updates.xml
index 0e83d4b71..f860d6b49 100644
--- a/astrid/res/values/strings-updates.xml
+++ b/astrid/res/values/strings-updates.xml
@@ -9,19 +9,23 @@
     
     <string name="update_string_friends">%1$s is now friends with %2$s</string>
     <string name="update_string_request_friendship">%1$s wants to be friends with you</string>
+    <!-- slide 22e -->
     <string name="update_string_confirmed_friendship">%1$s has confirmed your friendship request</string>
     <string name="update_string_task_created">%1$s created this task</string>
     <string name="update_string_task_created_global">%1$s created $link_task</string>
+    <!-- slide 24 b and c -->
     <string name="update_string_task_created_on_list">%1$s added $link_task to this list</string>
+    <!-- slide 22c -->
     <string name="update_string_task_completed">%1$s completed $link_task. Huzzah!</string>
     <string name="update_string_task_uncompleted">%1$s un-completed $link_task.</string>
     <string name="update_string_task_tagged">%1$s added $link_task to %4$s</string>
     <string name="update_string_task_tagged_list">%1$s added $link_task to this list</string>
+    <!-- slide 22d -->
     <string name="update_string_task_assigned">%1$s assigned $link_task to %4$s</string>
+    <!-- slide 24d -->
     <string name="update_string_default_comment">%1$s commented: %3$s</string>
     <string name="update_string_task_comment">%1$s Re: $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s Re: %2$s: %3$s</string>
     <string name="update_string_tag_created">%1$s created this list</string>
     <string name="update_string_tag_created_global">%1$s created the list %2$s</string>
 </resources>
-
diff --git a/astrid/res/values/strings-voice.xml b/astrid/res/values/strings-voice.xml
index e36efe155..7259e25e8 100644
--- a/astrid/res/values/strings-voice.xml
+++ b/astrid/res/values/strings-voice.xml
@@ -13,26 +13,26 @@
   <string name="EPr_voiceInputUnavailable_dlg">Unfortunately voice-input is not available for your system.\nIf possible, please update Android to 2.1 or later.</string>
   <!-- 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>
-  <!-- Preference: Task List Show Voice-button if recognition-service is available -->
+  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
   <string name="EPr_voiceInputEnabled_title">Voice Input</string>
-  <!-- Preference: voice button description (true) -->
+  <!-- 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>
-  <!-- Preference: Task List Voice-button directly creates tasks -->
+  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
   <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>
-  <!-- Preference: Task List Voice-creation description (false) -->
+  <!-- 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>
-  <!-- Preference: Voice reminders if TTS-service is available -->
+  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
   <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>
-  <!-- Preference: Voice reminders description (false) -->
+  <!-- slide 38c: Preference: Voice reminders description (false) -->
   <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task reminders</string>    
   
-  <!-- Preference Category: Voice Title -->
+  <!-- slide 32d: Preference Category: Voice Title -->
   <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 6615a3a3f..4769b634f 100644
--- a/astrid/res/values/strings-welcome.xml
+++ b/astrid/res/values/strings-welcome.xml
@@ -1,31 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-      
-    <string name="welcome_show_eula">Accept EULA to get started!</string>
-    
-    <string name="welcome_setting">Show Tutorial</string>
-    
-    <string name="welcome_title_1">Welcome to Astrid!</string>
-    <string name="welcome_title_2">Make lists</string>
-    <string name="welcome_title_3">Switch between lists</string>
-    <string name="welcome_title_4">Share lists</string>
-    <string name="welcome_title_5">Divvy up tasks</string>
-    <string name="welcome_title_6">Provide details</string>
-    <string name="welcome_title_7">Connect now\nto get started!</string>
-    
-    <string name="welcome_title_7_return">That\'s it!</string>
-    
-    <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends</string>
-    <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
-    <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
-    <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
-    <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>
-    <string name="welcome_body_6">Tap to add notes,\nset reminders,\nand much more!</string>
-    <string name="welcome_body_7">Login</string>
-    
-    <string name="welcome_body_7_return">Tap Astrid to return.</string>
-    
-    <string name="welcome_back">Back</string>
-    <string name="welcome_next">Next</string>
-    
-</resources>
\ No newline at end of file
+  
+  <string name="welcome_show_eula">Accept EULA to get started!</string>
+  <!-- slide 30a-->
+  <string name="welcome_setting">Show Tutorial</string>
+  
+  <string name="welcome_title_1">Welcome to Astrid!</string>
+
+  <!-- slide 2a -->
+  <string name="welcome_title_2">Make lists</string>
+
+  <!-- slide 3a-->
+  <string name="welcome_title_3">Switch between lists</string>
+
+  <!-- slide 4a -->
+  <string name="welcome_title_4">Share lists</string>
+
+  <!-- slide 5a -->
+  <string name="welcome_title_5">Divvy up tasks</string>
+
+  <!-- slide 6a -->
+  <string name="welcome_title_6">Provide details</string>
+
+  <!-- slide 7a -->
+  <string name="welcome_title_7">Connect now\nto get started!</string>
+  
+  <string name="welcome_title_7_return">That\'s it!</string>
+  
+  <!-- slide 1b -->
+  <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends</string>
+
+  <!-- slide 2b-->
+  <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
+
+  <!-- slide 3b -->
+  <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
+
+  <!-- slide 4b -->
+  <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
+
+  <!-- slide 5b -->
+  <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>
+
+  <!-- slide 6b-->
+  <string name="welcome_body_6">Tap to add notes,\nset reminders,\nand much more!</string>
+  <string name="welcome_body_7">Login</string>
+  
+  <string name="welcome_body_7_return">Tap Astrid to return.</string>
+  
+  <string name="welcome_back">Back</string>
+  <!-- slide 1c -->
+  <string name="welcome_next">Next</string>
+  
+</resources>