6 files changed, 52 insertions, 8 deletions
diff --git a/subsonic-android/res/layout/save_playlist.xml b/subsonic-android/res/layout/save_playlist.xml
index a0272f37..43f1827a 100644
--- a/subsonic-android/res/layout/save_playlist.xml
+++ b/subsonic-android/res/layout/save_playlist.xml
@@ -13,5 +13,14 @@
             android:inputType="text"
             android:singleLine="true"/>
 
+	<CheckBox
+			android:id="@+id/save_playlist_overwrite"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/playlist.overwrite"
+			android:layout_marginLeft="4dp"
+			android:checked="false"
+			android:visibility="gone"/>
+
 </LinearLayout>
 
diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml
index 7a45d34a..5926f8a5 100644
--- a/subsonic-android/res/menu/select_video_context.xml
+++ b/subsonic-android/res/menu/select_video_context.xml
@@ -11,11 +11,6 @@
 	<item 
 		android:id="@+id/song_menu_play_external"
 		android:title="@string/common.play_external"/>
-	
-	<item 
-		android:id="@+id/song_menu_webview"
-		android:title="@string/common.webview"
-		/>
 
 	<item 
 		android:id="@+id/song_menu_download"
diff --git a/subsonic-android/res/raw/changelog.xml b/subsonic-android/res/raw/changelog.xml
index 14f59866..95f71228 100644
--- a/subsonic-android/res/raw/changelog.xml
+++ b/subsonic-android/res/raw/changelog.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="4.0.5" versioncode="54" releasedate="6/7/2013">
+		<change>Fix album art on old Subsonic/MusicCabinet servers</change>
+	</release>
+	<release version="4.0.4" versioncode="53" releasedate="6/6/2013">
+		<change>Added Genre parsing (thanks archrival)</change>
+		<change>Changed Genre to combo selection on 4.8+ servers</change>
+		<change>Added video choice similar to Subsonic (Raw is the same as MX but you can choose which player to use)</change>
+		<change>Added 4x2, 4x3, 4x4 widgets (thanks archrival)</change>
+		<change>Add option to create new playlist when adding song to playlists</change>
+		<change>Added option to overwrite existing playlist on 4.7+ servers</change>
+		<change>Fix when removing the current server</change>
+		<change>Fix edge case in new sort</change>
+	</release>
 	<release version="4.0.3" versioncode="52" releasedate="5/31/2013">
 		<change>Sort by disc number if specified in tags</change>
 		<change>Show starred artists in starred list</change>
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 80cc4fad..daca9b8b 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -137,4 +137,15 @@
 		<item>@string/settings.temp_loss_nothing</item>
 	</string-array>
 
+	<string-array name="videoPlayerValues">
+		<item>raw</item>
+		<item>transcode</item>
+		<item>flash</item>
+	</string-array>
+	<string-array name="videoPlayerNames">
+		<item>@string/settings.video_raw</item>
+		<item>@string/settings.video_transcode</item>
+		<item>@string/settings.video_flash</item>
+	</string-array>
+
 </resources>
 \ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 5635a74e..a3f8f540 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -18,9 +18,8 @@
 	<string name="common.name">Name</string>
 	<string name="common.comment">Comment</string>
 	<string name="common.public">Public</string>
-	<string name="common.webview">Play Web View (Flash)</string>
-	<string name="common.play_external">Play External Player</string>
-	<string name="common.stream_external">Stream External Player</string>
+	<string name="common.play_external">Play Video</string>
+	<string name="common.stream_external">Stream Video</string>
 	<string name="common.confirm">Confirm</string>
 
     <string name="button_bar.home">Home</string>
@@ -75,6 +74,7 @@
 	<string name="playlist.update_info">Update Information</string>
 	<string name="playlist.updated_info">Updated playlist information for %s</string>
 	<string name="playlist.updated_info_error">Failed to update playlist information for %s</string>
+	<string name="playlist.overwrite">Overwrite existing playlist</string>
 
     <string name="help.label">Help</string>
     <string name="help.title">Welcome to DSub!</string>
@@ -287,6 +287,11 @@
 	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>
 	<string name="settings.chat_enabled">Chat Enabled</string>
 	<string name="settings.chat_enabled_summary">Whether or not to display the chat tab.  Restart app after changing.</string>
+	<string name="settings.video_title">Video</string>
+	<string name="settings.video_player">Video Player</string>
+	<string name="settings.video_raw">Raw (Requires Subsonic 4.8+)</string>
+	<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>
+	<string name="settings.video_flash">Flash (Requires Plugin)</string>
 
 	<string name="shuffle.startYear">Start Year:</string>
 	<string name="shuffle.endYear">End Year:</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index 17a51621..d3618ffa 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -25,6 +25,17 @@
 
     </PreferenceCategory>
 
+	<PreferenceCategory
+		android:title="@string/settings.video_title">
+
+		<ListPreference
+			android:title="@string/settings.video_player"
+			android:key="videoPlayer"
+			android:defaultValue="raw"
+			android:entryValues="@array/videoPlayerValues"
+			android:entries="@array/videoPlayerNames"/>
+	</PreferenceCategory>
+
     <PreferenceCategory
             android:title="@string/settings.network_title">