From 412255724d9d1ada3dbe975981483a786bdebd75 Mon Sep 17 00:00:00 2001
From: daneren2005 <daneren2005@gmail.com>
Date: Wed, 20 Nov 2013 16:19:34 -0800
Subject: Updated the error to be a little more helpful

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

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09fe7c29..1a4f8556 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -362,7 +362,7 @@
     <string name="background_task.no_network">This program requires network access. Please turn on Wi-Fi or mobile network.</string>
     <string name="background_task.network_error">A network error occurred. Please check the server address or try again later.</string>
     <string name="background_task.not_found">Resource not found. Please check the server address.</string>
-    <string name="background_task.parse_error">Didn\'t understand the reply. Please check the server address.</string>
+    <string name="background_task.parse_error">A problem occurred communicating with the server. Please check the server address and verify that you can connect using a regular browser on your device.</string>
 
     <string name="service.connecting">Contacting server, please wait.</string>
 
-- 
cgit v1.2.3


From 773036c5bd8711e72ffe1958bed5f18d9745b73a Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 22 Nov 2013 19:08:39 -0800
Subject: Added setting for custom sort

---
 res/values/strings.xml | 2 ++
 res/xml/settings.xml   | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1a4f8556..7647ac8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -257,6 +257,8 @@
 	<string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>
 	<string name="settings.track_title">Display Track #</string>
 	<string name="settings.track_summary">Display Track # in front of songs if one exists</string>
+	<string name="settings.custom_sort">Custom Sort</string>
+	<string name="settings.custom_sort_summary">Sort directory listings to properly sort by disc number.  Interferes with the servers sort albums by year.</string>
     <string name="settings.network_title">Network</string>
     <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string>
     <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f83f361c..07a88c08 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -43,6 +43,12 @@
 				android:key="hideWidget"
 				android:defaultValue="false"/>
 
+			<CheckBoxPreference
+				android:title="@string/settings.custom_sort"
+				android:summary="@string/settings.custom_sort_summary"
+				android:key="customSortEnabled"
+				android:defaultValue="true"/>
+
 		</PreferenceCategory>
 
 		<PreferenceCategory
-- 
cgit v1.2.3