diff options
| author | Thomas Knepper <thknepper@gmx.de> | 2014-04-09 11:22:42 +0200 |
|---|---|---|
| committer | Thomas Knepper <thknepper@gmx.de> | 2014-04-09 11:22:42 +0200 |
| commit | e7d54c69a86d443ad9eac085ef3a55428d7bec43 (patch) | |
| tree | be4795e7760029df5b16a7dc8b6a596ef9ce8830 /res/values | |
| parent | 1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884 (diff) | |
| parent | 5b2c0aa9c2de27653537a37b1d29dd12acfc853f (diff) | |
| download | dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.tar.gz dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.tar.bz2 dsub-e7d54c69a86d443ad9eac085ef3a55428d7bec43.zip | |
Merge branch 'master' of git://github.com/daneren2005/Subsonic
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7fec7760..e8eee980 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -8,6 +8,7 @@ <item>@string/button_bar.bookmarks</item> <item>@string/button_bar.shares</item> <item>@string/button_bar.chat</item> + <item>@string/button_bar.downloading</item> <item>@string/menu.settings</item> </string-array> @@ -19,6 +20,7 @@ <item>Bookmark</item> <item>Share</item> <item>Chat</item> + <item>Download</item> <item>Settings</item> </string-array> @@ -30,6 +32,7 @@ <item>@drawable/ic_menu_bookmark_light</item> <item>@drawable/ic_menu_share_light</item> <item>@drawable/ic_menu_chat_light</item> + <item>@drawable/ic_menu_download_light</item> <item>@drawable/ic_menu_settings_light</item> </array> @@ -41,6 +44,7 @@ <item>@drawable/ic_menu_bookmark_dark</item> <item>@drawable/ic_menu_share_dark</item> <item>@drawable/ic_menu_chat_dark</item> + <item>@drawable/ic_menu_download_dark</item> <item>@drawable/ic_menu_settings_dark</item> </array> diff --git a/res/values/strings.xml b/res/values/strings.xml index 87c7c8e0..dbb08ee0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -35,6 +35,7 @@ <string name="button_bar.bookmarks">Bookmarks</string>
<string name="button_bar.shares">Shares</string>
<string name="button_bar.chat">Chat</string>
+ <string name="button_bar.downloading">Downloading</string>
<string name="main.welcome_title">Welcome!</string>
<string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
@@ -183,8 +184,6 @@ <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string>
<string name="download.jukebox_offline">Remote control is not available in offline mode.</string>
<string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users > Settings</b> on your Subsonic server.</string>
- <string name="download.show_downloading">Show Downloading</string>
- <string name="download.show_now_playing">Show Now Playing</string>
<string name="download.timer_length">Timer:</string>
<string name="download.start_timer">Start Timer</string>
<string name="download.stop_timer">Stop Timer</string>
|