aboutsummaryrefslogtreecommitdiff
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-23 15:13:32 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-23 15:13:32 -0800
commite7039a7e10c3efcb5d637bbbaa0111b092a4e214 (patch)
tree24adffc215af1adea16b5cefe84c40c5967fb126 /res/values/strings.xml
parent22a88ac31554301346ac20223bc22b949b1c344e (diff)
parentb5f029b6ec6a22b4c8e6d1e7d61b77affb483a77 (diff)
downloaddsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.tar.gz
dsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.tar.bz2
dsub-e7039a7e10c3efcb5d637bbbaa0111b092a4e214.zip
Merge branch 'master' of https://github.com/daneren2005/Subsonic into SyncAdapter
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 52c899e2..1a2068f0 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>
@@ -368,7 +370,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>