aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-06-22 10:09:16 -0700
committerScott Jackson <daneren2005@gmail.com>2013-06-22 10:09:16 -0700
commit6e14f332abb5e0128dc19ea4bbe86b8fe8c742ff (patch)
tree429d1bfaf91ad72e3be617df48cfc381bea5278f /subsonic-android/res
parent51e3c8143dddb8192b6c1aa035e70c462902b338 (diff)
downloaddsub-6e14f332abb5e0128dc19ea4bbe86b8fe8c742ff.tar.gz
dsub-6e14f332abb5e0128dc19ea4bbe86b8fe8c742ff.tar.bz2
dsub-6e14f332abb5e0128dc19ea4bbe86b8fe8c742ff.zip
Move to more abstract offline sync dialog that can support more syncs, added option for default action
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/layout/sync_dialog.xml12
-rw-r--r--subsonic-android/res/values/strings.xml11
2 files changed, 18 insertions, 5 deletions
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/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>