From 946b5572e53252f2ab54a628ce56d9519d1af2c7 Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Wed, 23 Jan 2013 23:52:38 -0700
Subject: [PATCH] Consistent casing in Settings, fix footer in Albums when More
 is not visible.

---
 AndroidManifest.xml                                  |  2 +-
 res/values/strings.xml                               | 12 ++++++------
 .../androidapp/activity/SelectAlbumActivity.java     |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e13c2456..3ecd286b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
           package="net.sourceforge.subsonic.androidapp"
           a:versionCode="47"
-          a:versionName="3.9.9.11" a:installLocation="auto">
+          a:versionName="3.9.9.12" a:installLocation="auto">
 
     <uses-permission a:name="android.permission.INTERNET"/>
     <uses-permission a:name="android.permission.READ_PHONE_STATE"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a4f4c5f4..182ef4d7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -137,7 +137,7 @@
     <string name="settings.server_username">Username</string>
     <string name="settings.server_password">Password</string>
     <string name="settings.cache_title">Music Cache</string>
-    <string name="settings.preload">Songs to preload</string>
+    <string name="settings.preload">Songs To Preload</string>
     <string name="settings.cache_size">Cache Size</string>
     <string name="settings.cache_location">Cache Location</string>
     <string name="settings.cache_location_error">Invalid cache location. Using default.</string>
@@ -167,7 +167,7 @@
     <string name="settings.max_bitrate_256">256 Kbps</string>
     <string name="settings.max_bitrate_320">320 Kbps</string>
     <string name="settings.max_bitrate_unlimited">Unlimited</string>
-    <string name="settings.wifi_required_title">Wi-Fi streaming only</string>
+    <string name="settings.wifi_required_title">Wi-Fi Streaming Only</string>
     <string name="settings.wifi_required_summary">Only stream media if connected to Wi-Fi</string>
     <string name="settings.preload_1">1 song</string>
     <string name="settings.preload_2">2 songs</string>
@@ -184,7 +184,7 @@
     <string name="settings.cache_size_10000">10 GB</string>
     <string name="settings.cache_size_20000">20 GB</string>
     <string name="settings.cache_size_unlimited">Unlimited</string>
-    <string name="settings.clear_search_history">Clear search history</string>
+    <string name="settings.clear_search_history">Clear Search History</string>
     <string name="settings.search_history_cleared">Search history cleared</string>
     <string name="settings.other_title">Other Settings</string>
     <string name="settings.search_title">Search Settings</string>
@@ -197,8 +197,8 @@
     <string name="settings.media_button_summary">Respond to phone, headset and Bluetooth media buttons</string>
     <string name="settings.screen_lit_title">Keep Screen On</string>
     <string name="settings.screen_lit_summary">Keeping the screen on while downloading improves download speed.</string>
-    <string name="settings.buffer_length">Buffer length</string>
-    <string name="settings.network_timeout">Network timeout</string>
+    <string name="settings.buffer_length">Buffer Length</string>
+    <string name="settings.network_timeout">Network Timeout</string>
     <string name="settings.buffer_length_2">2 seconds</string>
     <string name="settings.buffer_length_5">5 seconds</string>
     <string name="settings.buffer_length_8">8 seconds</string>
@@ -215,7 +215,7 @@
     <string name="settings.network_timeout_90000">90 seconds</string>
     <string name="settings.network_timeout_105000">105 seconds</string>
     <string name="settings.network_timeout_120000">120 seconds</string>
-    <string name="settings.show_notification">Show notification</string>
+    <string name="settings.show_notification">Show Notification</string>
     <string name="settings.show_notification_summary">Show now playing notification in the status bar</string>
     <string name="settings.max_albums">Max Albums</string>
     <string name="settings.max_albums_summary">Number of albums to return</string>
diff --git a/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java b/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java
index d5be485e..bba41dae 100644
--- a/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java
+++ b/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java
@@ -378,10 +378,9 @@ public class SelectAlbumActivity extends SubsonicTabActivity {
                     if (result.getFirst().getChildren().size() < getIntent().getIntExtra(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 0)) {
                     	moreButton.setVisibility(View.GONE);
                     } else {
+                    	entryList.addFooterView(footer);
                     	moreButton.setVisibility(View.VISIBLE);
                     }
-                    
-                    entryList.addFooterView(footer);
 
                     moreButton.setOnClickListener(new View.OnClickListener() {
                         @Override