diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-06-09 21:57:52 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-06-09 21:57:52 -0700 |
commit | dd322b8281954c04eca55ab118b82296c2797221 (patch) | |
tree | 597f35d129bce78a9761dde285bb484895f38a50 /res/values | |
parent | ab1814ea9b50feebce21aff2759172d7193afa7a (diff) | |
parent | cc480686122e19c46f9e74c3c1227c9c8ff3b78c (diff) | |
download | dsub-dd322b8281954c04eca55ab118b82296c2797221.tar.gz dsub-dd322b8281954c04eca55ab118b82296c2797221.tar.bz2 dsub-dd322b8281954c04eca55ab118b82296c2797221.zip |
Merge branch 'master' of https://github.com/daneren2005/Subsonic into Admin
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | res/values/themes.xml | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 1e8b365f..b820c371 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -8,6 +8,7 @@ <attr name="media_button_start" format="reference"/> <attr name="media_button_stop" format="reference"/> <attr name="chat_send" format="reference"/> + <attr name="add" format="reference"/> <attr name="download_none" format="reference"/> <attr name="shuffle" format="reference"/> <attr name="refresh" format="reference"/> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3148ae99..add99c11 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -364,7 +364,7 @@ <string name="settings.persistent_title">Persistent Notification</string>
<string name="settings.persistent_summary">Show the notification even after pausing. Press the stop button to clear it away.</string>
<string name="settings.gapless_playback">Gapless Playback</string>
- <string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback. Turn this off to fix the issue.</string>
+ <string name="settings.gapless_playback_summary">If you are seeing strange bugs during playback, turning this off may help.</string>
<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>
<string name="settings.chat_enabled">Chat Enabled</string>
<string name="settings.chat_enabled_summary">Whether or not to display the chat listing in the pull out drawer</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml index 8d565802..0f464baa 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -11,6 +11,7 @@ <item name="media_button_start">@drawable/media_start_light</item> <item name="media_button_stop">@drawable/media_stop_light</item> <item name="chat_send">@drawable/ic_menu_chat_send_light</item> + <item name="add">@drawable/ic_action_add_light</item> <item name="download_none">@drawable/download_none_light</item> <item name="shuffle">@drawable/ic_menu_shuffle_light</item> <item name="refresh">@drawable/ic_menu_refresh_light</item> @@ -40,6 +41,7 @@ <item name="media_button_start">@drawable/media_start_dark</item> <item name="media_button_stop">@drawable/media_stop_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> + <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_dark</item> <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> <item name="refresh">@drawable/ic_menu_refresh_dark</item> @@ -72,6 +74,7 @@ <item name="media_button_start">@drawable/media_start_dark</item> <item name="media_button_stop">@drawable/media_stop_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> + <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_dark</item> <item name="shuffle">@drawable/ic_menu_shuffle_dark</item> <item name="refresh">@drawable/ic_menu_refresh_dark</item> |