5 files changed, 1 insertions, 11 deletions
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5dd4cdda..cb245e83 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -308,7 +308,6 @@
     <string name="settings.screen_lit_summary">Mantener la pantalla encendida durantes las descargas mejora la velocidad de descarga.</string>
 	<string name="settings.playlist_title">Listas de reproducción</string>
 	<string name="settings.playlist_random_size_title">Tamaño aleatorio</string>
-	<string name="settings.buffer_length">Tamaño del buffer (0 = totalmente en caché)</string>
 	<string name="settings.sleep_timer_title">Temporizador</string>
 	<string name="settings.sleep_timer_duration_title">Duración del temporizador</string>
 	<string name="settings.sleep_timer_off">Encendido</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c4f50fdd..afe5db36 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -325,7 +325,6 @@
     <string name="settings.screen_lit_summary">Képernyő ébrentartása a letöltés alatt, a magasabb letöltési sebesség érdekében.</string>
 	<string name="settings.playlist_title">Lejátszási listák</string>
 	<string name="settings.playlist_random_size_title">Véletlenszerű lejátszási lista mérete</string>
-	<string name="settings.buffer_length">Pufferméret (0 = teljes gyorsítótárazás)</string>
 	<string name="settings.sleep_timer_title">Alvás időzítő</string>
 	<string name="settings.sleep_timer_duration_title">Alvás időzítő időtartam</string>
 	<string name="settings.sleep_timer_off">Ki</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2671a8b6..f53a421c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -234,7 +234,6 @@
     <string name="settings.screen_lit_summary">Оставить экран включенным для повышения скорости при скачивании.</string>
 	<string name="settings.playlist_title">Списки воспроизведения</string>
 	<string name="settings.playlist_random_size_title">Размер случайного списка</string>
-	<string name="settings.buffer_length">Размер буфера (0 = кешировать полностью)</string>
 	<string name="settings.sleep_timer_title">Таймер сна</string>
 	<string name="settings.sleep_timer_duration_title">Продолжительность таймера сна</string>
 	<string name="settings.sleep_timer_off">Выключен</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7abcbd28..1d4398f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -272,7 +272,7 @@
 	<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.custom_sort_summary">Override default server sorting to sort by disc number and 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>
@@ -328,7 +328,6 @@
     <string name="settings.screen_lit_summary">Keeping the screen on while downloading improves download speed.</string>
 	<string name="settings.playlist_title">Play</string>
 	<string name="settings.playlist_random_size_title">Random Size</string>
-	<string name="settings.buffer_length">Buffer Length (0 = when fully cached)</string>
 	<string name="settings.sleep_timer_title">Sleep Timer</string>
 	<string name="settings.sleep_timer_duration_title">Sleep Timer Duration</string>
 	<string name="settings.sleep_timer_off">Off</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 30b2e584..573da94b 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -278,12 +278,6 @@
 				android:title="@string/settings.playback_title">
 
 				<EditTextPreference
-					android:title="@string/settings.buffer_length"
-					android:key="bufferLength"
-					android:defaultValue="5"
-					android:digits="0123456789"/>
-
-				<EditTextPreference
 					android:title="@string/settings.playlist_random_size_title"
 					android:key="randomSize"
 					android:defaultValue="20"