diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index fd6008da0..723637686 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -4,22 +4,6 @@
     
   <!-- Resources for built-in backup plug-in -->
   
-  <!-- ============================================== BackupPreferences == -->
-
-  <string name="backup_BPr_backup_title">Automatic Backups</string>
-
-  <!--  backup summary when there is no backup message -->
-  <string name="backup_BPr_backup_desc">Perform daily backups to sdcard.</string>
-
-  <!--  backup failure message (%s -> error message) -->
-  <string name="backup_BPr_backup_desc_failure">Last backup failed: %s</string>
-
-  <!--  backup failure error when error message is null -->
-  <string name="backup_BPr_backup_desc_failure_null">Last backup failed, could not read SD card</string>
-
-  <!--  backup success message (%s -> date) -->
-  <string name="backup_BPr_backup_desc_success">Latest backup was on %s</string>
-  
   <!-- ================================================= BackupPreferences == -->
 
     <!-- Preferences Title -->    
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index a96f68231..2db1123fd 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -304,15 +304,6 @@ to the plugin creator for fastest service.
   
   <!-- Elapsed time label -->
   <string name="TEA_elapsedDuration_label">Time Already Spent on Task</string>
-  
-  <!-- Save button -->
-  <string name="TEA_save_label">Save</string>
-  
-  <!-- Don't Save button -->
-  <string name="TEA_cancel_label">Cancel</string>
-  
-  <!-- Delete button -->
-  <string name="TEA_delete_label">Delete</string>
 
   <!-- Menu: Save -->    
   <string name="TEA_menu_save">Save Changes</string>
@@ -338,7 +329,7 @@ to the plugin creator for fastest service.
   <!-- Toast: task was deleted -->
   <string name="TEA_onTaskDelete">Task Deleted!</string>
   
-  <!-- ===================== IntroductionActivity == -->
+  <!-- ============================================= IntroductionActivity == -->
   
   <!-- Introduction Window title -->
   <string name="InA_title">Welcome to Astrid!</string>
@@ -411,12 +402,24 @@ to the plugin creator for fastest service.
   
   <!-- ============================================================= Misc == -->
   
-  <!-- %s => name of the application -->
+  <!-- Displayed when task killer found. %s => name of the application -->
   <string name="task_killer_help">
 It looks like you are using an app that can kill processes (%s)! If you can,
 add Astrid to the exclusion list so it doesn\'t get killed. Otherwise,
 Astrid might not let you know when your tasks are due.\n
   </string>
+  
+  <!-- Task killer dialog ok button -->
   <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
     
+  <!-- Astrid's Android Marketplace title. It never appears in the app itself. -->
+  <string name="marketplace_title">Astrid Task/Todo List</string>
+  
+  <!-- Astrid's Android Marketplace description. It never appears in the app itself. -->
+  <string name="marketplace_description">
+Astrid is the highly-acclaimed open-source task list that is simple enough to
+not get in your way, powerful enough to help you get stuff done! Tags, 
+reminders, RememberTheMilk sync, Locale plug-in &amp; more!
+  </string>
+    
 </resources>
diff --git a/astrid/res/values/strings-gcal.xml b/astrid/res/values/strings-gcal.xml
index 30c6cf5ff..57a591971 100644
--- a/astrid/res/values/strings-gcal.xml
+++ b/astrid/res/values/strings-gcal.xml
@@ -23,14 +23,6 @@
   <!-- Calendar event name when task is completed (%s => task title) -->
   <string name="gcal_completed_title">%s (completed)</string>
 
-  <!-- ============================================== Calendar Preferences == -->
-  
-  <!-- Preference: Calendar Setting Title  -->
-  <string name="gcal_GCP_title">Default Calendar</string>
-  
-  <!-- Preference: Calendar Setting Summary (%s -> calendar summary)  -->
-  <string name="gcal_GCP_summary">Current Setting: %s</string>
-  
   <!-- System Default Calendar (displayed if we can't figure out calendars)  -->
   <string name="gcal_GCP_default">Default Calendar</string>
 
diff --git a/astrid/res/values/strings-rmilk.xml b/astrid/res/values/strings-rmilk.xml
index 2ab8b2d10..bc04cce91 100644
--- a/astrid/res/values/strings-rmilk.xml
+++ b/astrid/res/values/strings-rmilk.xml
@@ -120,11 +120,13 @@ Error Message: %s
     
     <!-- ======================== Synchronization ========================== -->    
     
-    <!-- rmilk-specific constants -->
+    <!-- title for notification tray when synchronizing -->
     <string name="rmilk_notification_title">Astrid: Remember the Milk</string>
     
+    <!-- confirmation dialog for RTM log out -->
     <string name="rmilk_forget_confirm">Log out / clear synchronization data?</string>
     
+    <!-- Error msg when io exception with rmilk -->
     <string name="rmilk_ioerror">Connection Error! Check your Internet connection, 
     or maybe RTM servers (status.rememberthemilk.com), for possible solutions.</string>
         
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 571001082..ff19a21f3 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -477,15 +477,15 @@ public final class TaskEditActivity extends TabActivity {
         super.onCreateOptionsMenu(menu);
         MenuItem item;
 
-        item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_save_label);
+        item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
         item.setIcon(android.R.drawable.ic_menu_save);
         item.setAlphabeticShortcut('s');
 
-        item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_cancel_label);
+        item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
         item.setIcon(android.R.drawable.ic_menu_close_clear_cancel);
         item.setAlphabeticShortcut('c');
 
-        item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_delete_label);
+        item = menu.add(Menu.NONE, MENU_DELETE_ID, 0, R.string.TEA_menu_delete);
         item.setIcon(android.R.drawable.ic_menu_delete);
         item.setAlphabeticShortcut('d');