From ad6c9503cbb56eda5b0ff3a0060b625f827e753c Mon Sep 17 00:00:00 2001
From: Tom Briden <tom.briden@veritape.com>
Date: Wed, 5 Jun 2013 15:45:37 +0100
Subject: Added dialog when offline scrobble file found to scrobble now, ignore
 or just delete it Made processOfflineScrobbles a musicservice function so it
 can be called from fragment

---
 subsonic-android/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index b5e8f3e1..5aa09d76 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -114,6 +114,11 @@
     <string name="select_album.donate_dialog_now">Now</string>
     <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="select_album.offline_scrobbles_dialog_title">Offline scrobbles file found.</string>
+    <string name="select_album.offline_scrobbles_dialog_message">Process offline scrobbles file?</string>
+    <string name="select_album.offline_scrobbles_dialog_yes">Yes</string>
+    <string name="select_album.offline_scrobbles_dialog_no">No</string>
+    <string name="select_album.offline_scrobbles_dialog_delete">Delete file<string>
 
 	<string name="select_genre.empty">No genres found</string>
 
-- 
cgit v1.2.3


From 1549d7f25c2ad8e3fe6ca63e6ff66c4e3ee99e1f Mon Sep 17 00:00:00 2001
From: Tom Briden <tom.briden@veritape.com>
Date: Wed, 5 Jun 2013 16:02:30 +0100
Subject: fix typo in strings.xml

---
 subsonic-android/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 5aa09d76..5635a74e 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -118,7 +118,7 @@
     <string name="select_album.offline_scrobbles_dialog_message">Process offline scrobbles file?</string>
     <string name="select_album.offline_scrobbles_dialog_yes">Yes</string>
     <string name="select_album.offline_scrobbles_dialog_no">No</string>
-    <string name="select_album.offline_scrobbles_dialog_delete">Delete file<string>
+    <string name="select_album.offline_scrobbles_dialog_delete">Delete file</string>
 
 	<string name="select_genre.empty">No genres found</string>
 
-- 
cgit v1.2.3