--- a/application/data/PodcastClient_english.rls	Mon Nov 15 20:54:27 2010 +0000
+++ b/application/data/PodcastClient_english.rls	Mon Nov 15 21:37:46 2010 +0000
@@ -51,8 +51,8 @@
 // Settings view
 rls_string STRING_r_podcast_settings_title "Settings"
 rls_string STRING_r_podcast_setting_showdir "Podcast folder"
-rls_string STRING_r_podcast_setting_autoupdate "Automatic update"
-rls_string STRING_r_podcast_setting_autodownload "Automatic download"
+rls_string STRING_r_podcast_setting_autoupdate "Update feeds"
+rls_string STRING_r_podcast_setting_autodownload "Download shows"
 rls_string STRING_r_podcast_setting_connection "Connection"
 rls_string STRING_r_podcast_setting_default "Use default"
 rls_string STRING_r_podcast_setting_alwaysask "Always ask"
@@ -60,15 +60,15 @@
 rls_string STRING_r_podcast_setting_iaplist "Access points"
 rls_string STRING_r_podcast_select_folder "Select folder"
 //enable and disable automatic connections
-rls_string STRING_r_on "On"
-rls_string STRING_r_off "Off"
+rls_string STRING_r_on "Automatically"
+rls_string STRING_r_off "Manually"
 rls_string STRING_r_podcast_setting_reset_db "Reset database"
 rls_string STRING_r_podcast_setting_reset_db_query "Reset database? All data will be lost!"
 
 
 
 // Choicelist for autodownload
-rls_string STRING_podcast_autoupdate_option1 "Off"
+rls_string STRING_podcast_autoupdate_option1 "Manually"
 rls_string STRING_podcast_autoupdate_option2 "Every hour"
 rls_string STRING_podcast_autoupdate_option3 "Four times a day"
 rls_string STRING_podcast_autoupdate_option4 "Twice a day"
@@ -164,8 +164,9 @@
 rls_string STRING_r_download_queue "Download queue"
 rls_string STRING_r_mark_all_old_query "Mark all shows old?"
 rls_string STRING_r_download_all_query "Add all shows to download queue?"
-rls_string STRING_r_podcast_setting_autodelete "Automatic delete old"
-rls_string STRING_podcast_autodelete_option1 "Off"
-rls_string STRING_podcast_autodelete_option2 "After 1 day"
-rls_string STRING_podcast_autodelete_option3 "After 7 days"
+rls_string STRING_r_podcast_setting_autodelete "Delete old shows"
+rls_string STRING_podcast_autodelete_option1 "Manually"
+rls_string STRING_podcast_autodelete_option2 "1 day after playing"
+rls_string STRING_podcast_autodelete_option3 "7 days after playing"
+rls_string STRING_podcast_autodelete_option4 "30 days after playing"
 rls_string STRING_r_download_all_shows "Download all shows"

--- a/application/data/PodcastQueueView.ra	Mon Nov 15 20:54:27 2010 +0000
+++ b/application/data/PodcastQueueView.ra	Mon Nov 15 21:37:46 2010 +0000
@@ -154,6 +154,16 @@
 				},
 			STYLUS_POPUP_MENU_ITEM
 				{
+					txt = STRING_r_view_mark_as_unplayed_cmd_short;
+					command = EPodcastMarkAsUnplayed;
+				},
+			STYLUS_POPUP_MENU_ITEM
+				{
+					txt = STRING_r_view_mark_as_played_cmd_short;
+					command = EPodcastMarkAsPlayed;
+				},
+			STYLUS_POPUP_MENU_ITEM
+				{
 					txt = STRING_r_view_move_up_short_cmd;
 					command = EPodcastMoveDownloadUp;
 				},

--- a/application/src/PodcastQueueView.cpp	Mon Nov 15 20:54:27 2010 +0000
+++ b/application/src/PodcastQueueView.cpp	Mon Nov 15 21:37:46 2010 +0000
@@ -337,7 +337,7 @@
 			}
 			break;
 		default:
-			CPodcastListView::HandleCommandL(aCommand);
+			CPodcastShowsView::HandleCommandL(aCommand);
 			break;
 		}
 	iListContainer->SetLongTapDetectedL(EFalse); // in case we got here by long tapping
@@ -391,7 +391,13 @@
 		
 		iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadDown, dimDown);
 		iStylusPopupMenu->SetItemDimmed(EPodcastMoveDownloadUp, dimUp);
-		
+
+		TInt index = iListContainer->Listbox()->CurrentItemIndex();
+		CShowInfo *info = iPodcastModel.ActiveShowList()[index];
+
+		iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsPlayed, info->PlayState() != ENeverPlayed);
+		iStylusPopupMenu->SetItemDimmed(EPodcastMarkAsUnplayed, info->PlayState() == ENeverPlayed);
+	
 		iStylusPopupMenu->ShowMenu();
 		iStylusPopupMenu->SetPosition(aPenEventLocation);
     }