diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-01-19 14:07:44 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-01-19 14:07:44 -0800 |
| commit | 5cc2e1596af9edb33e74ee648ccf8fc3755bed96 (patch) | |
| tree | 3ce565aa4766b778af55b266e6b5321f11264b3f /res/values | |
| parent | fdda03ceed2b46a4a008dac48e88c4bc5e654aa3 (diff) | |
| parent | 7d53ef61b7498a8dd0e5f63bc2e907eb4937b261 (diff) | |
| download | dsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.tar.gz dsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.tar.bz2 dsub-5cc2e1596af9edb33e74ee648ccf8fc3755bed96.zip | |
Merge commit
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 5 | ||||
| -rw-r--r-- | res/values/themes.xml | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 461f73c7..5c2a4614 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -244,7 +244,9 @@ <string name="settings.server_unused">Unused</string>
<string name="settings.server_name">Name</string>
<string name="settings.server_address">Server address</string>
- <string name="settings.server_internal_address">Internal network address</string>
+ <string name="settings.server_local_network_ssid" >Local network SSID</string>
+ <string name="settings.server_local_network_ssid_hint">Current SSID: %s</string>
+ <string name="settings.server_internal_address">Local network address</string>
<string name="settings.server_username">Username</string>
<string name="settings.server_password">Password</string>
<string name="settings.server_open_browser">Open in browser</string>
@@ -438,6 +440,7 @@ <string name="parser.not_authenticated">Wrong username or password.</string>
<string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>
<string name="parser.artist_count">Got %d artists.</string>
+ <string name="parser.server_error">Server error: %s</string>
<string name="select_artist.refresh">Refresh</string>
<string name="select_artist.folder">Select folder</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml index 9aa83d2a..8a2bff2c 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -25,7 +25,7 @@ <item name="share">@drawable/ic_menu_share_light</item> <item name="drawerItemsIcons">@array/drawerItemIconsLight</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> - <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> + <item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item> </style> <style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat"> <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item> @@ -53,7 +53,7 @@ <item name="share">@drawable/ic_menu_share_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> - <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> + <item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item> </style> <style name="Theme.DSub.Black" parent="Theme.DSub.Dark"> <item name="android:windowBackground">@android:color/black</item> @@ -84,7 +84,7 @@ <item name="share">@drawable/ic_menu_share_dark</item> <item name="drawerItemsIcons">@array/drawerItemIconsDark</item> <item name="android:textViewStyle">@style/DSub.TextViewStyle</item> - <item name="android:buttonStyle">@style/DSub.ButtonStyle</item> + <item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item> </style> <style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid"> @@ -111,6 +111,8 @@ <style name="DSub.TextViewStyle" parent="android:Widget.TextView"> </style> - <style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button"> + <style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button"> + </style> + <style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button"> </style> </resources> |