5 files changed, 20 insertions, 9 deletions
diff --git a/subsonic-android/res/layout/main.xml b/subsonic-android/res/layout/main.xml
index a2a46a1e..c388327d 100644
--- a/subsonic-android/res/layout/main.xml
+++ b/subsonic-android/res/layout/main.xml
@@ -21,7 +21,8 @@
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:background="@drawable/media_button"
-		android:orientation="horizontal" >
+		android:orientation="horizontal"
+		android:visibility="gone">
 
 		<ImageView
 			android:id="@+id/album_art"
diff --git a/subsonic-android/res/layout/select_album_header.xml b/subsonic-android/res/layout/select_album_header.xml
index 3af34a99..2bf74110 100644
--- a/subsonic-android/res/layout/select_album_header.xml
+++ b/subsonic-android/res/layout/select_album_header.xml
@@ -24,7 +24,6 @@
 		android:paddingTop="20dip"
 		android:paddingBottom="8dip"
 		android:paddingRight="4dip"
-		android:textColor="@color/mediaControlForeground"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textStyle="bold"
 		android:singleLine="true"
diff --git a/subsonic-android/res/layout/sync_dialog.xml b/subsonic-android/res/layout/sync_dialog.xml
new file mode 100644
index 00000000..5133b753
--- /dev/null
+++ b/subsonic-android/res/layout/sync_dialog.xml
@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+    <CheckBox
+        android:id="@+id/sync_default"
+        style="?android:attr/textAppearanceMedium"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+		android:checked="false"
+		android:text="@string/offline.sync_dialog_default"/>
+</FrameLayout>
+\ No newline at end of file
diff --git a/subsonic-android/res/values/colors.xml b/subsonic-android/res/values/colors.xml
index d17486a1..0ce98fc9 100644
--- a/subsonic-android/res/values/colors.xml
+++ b/subsonic-android/res/values/colors.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<color name="lightBackground">#F1F0E6</color>
-    <color name="mediaControlBackground">#000000</color>
-    <color name="mediaControlForeground">#F0F0F0</color>
     <color name="dividerColor">#FF33B5E5</color>
     <color name="appwidget_text">#FFFFFF</color>
     <color name="notificationArtist">#434343</color>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 545dcdac..74153fc2 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -117,11 +117,12 @@
     <string name="select_album.donate_dialog_later">Later</string>
     <string name="select_album.donate_dialog_0_trial_days_left">Trial period is over</string>
 
-    <string name="offline.scrobbles_dialog_title">Offline scrobbles file found.</string>
-    <string name="offline.scrobbles_dialog_message">Process offline scrobbles file?</string>
-	<string name="offline.scrobbles_success">Successfully scrobbled %1$d songs</string>
-	<string name="offline.scrobbles_partial">Successfully scrobbled %1$d of %2$d songs.  Try the rest on a different server.</string>
-	<string name="offline.scrobbles_error">Failed to scrobble songs</string>
+    <string name="offline.sync_dialog_title">Offline songs waiting to be synced</string>
+    <string name="offline.sync_dialog_message">Process %1$d offline scrobbles?</string>
+	<string name="offline.sync_dialog_default">Use action as default</string>
+	<string name="offline.sync_success">Successfully scrobbled %1$d songs</string>
+	<string name="offline.sync_partial">Successfully scrobbled %1$d of %2$d songs</string>
+	<string name="offline.sync_error">Failed to sync songs</string>
 
 	<string name="select_genre.empty">No genres found</string>
 	<string name="select_genre.blank">Blank</string>