aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-07-02 22:51:24 -0700
committerScott Jackson <daneren2005@gmail.com>2013-07-02 22:51:24 -0700
commit5d4d0d4d6da34b810e59aa55f9fab0ad3445db9d (patch)
tree382dc97023a977fb1510a6e4fce3101c4e1e318d /subsonic-android/res
parent6f1c5cd259e871b72f41f21138b07bbd30f45c4f (diff)
downloaddsub-5d4d0d4d6da34b810e59aa55f9fab0ad3445db9d.tar.gz
dsub-5d4d0d4d6da34b810e59aa55f9fab0ad3445db9d.tar.bz2
dsub-5d4d0d4d6da34b810e59aa55f9fab0ad3445db9d.zip
Added download/delete menus to podcasts episodes, podcast refresh button
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/menu/select_podcast_episode.xml5
-rw-r--r--subsonic-android/res/menu/select_podcast_episode_context.xml7
-rw-r--r--subsonic-android/res/menu/select_podcast_episode_offline.xml9
-rw-r--r--subsonic-android/res/menu/select_podcasts.xml5
-rw-r--r--subsonic-android/res/values/strings.xml8
5 files changed, 25 insertions, 9 deletions
diff --git a/subsonic-android/res/menu/select_podcast_episode.xml b/subsonic-android/res/menu/select_podcast_episode.xml
index b6db96aa..ff5898e2 100644
--- a/subsonic-android/res/menu/select_podcast_episode.xml
+++ b/subsonic-android/res/menu/select_podcast_episode.xml
@@ -5,4 +5,9 @@
android:icon="@drawable/action_refresh"
android:title="@string/menu.refresh"
android:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_delete"
+ android:icon="@drawable/action_remove_all"
+ android:title="@string/common.delete"/>
</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_context.xml b/subsonic-android/res/menu/select_podcast_episode_context.xml
index 2c0d86ff..25c83989 100644
--- a/subsonic-android/res/menu/select_podcast_episode_context.xml
+++ b/subsonic-android/res/menu/select_podcast_episode_context.xml
@@ -25,4 +25,11 @@
android:id="@+id/song_menu_delete"
android:title="@string/common.delete"/>
+ <item
+ android:id="@+id/song_menu_server_download"
+ android:title="@string/select_podcasts.server_download"/>
+
+ <item
+ android:id="@+id/song_menu_server_delete"
+ android:title="@string/select_podcasts.server_delete"/>
</menu>
diff --git a/subsonic-android/res/menu/select_podcast_episode_offline.xml b/subsonic-android/res/menu/select_podcast_episode_offline.xml
index ce414955..9bbc2d92 100644
--- a/subsonic-android/res/menu/select_podcast_episode_offline.xml
+++ b/subsonic-android/res/menu/select_podcast_episode_offline.xml
@@ -9,12 +9,5 @@
<item
android:id="@+id/menu_delete"
android:icon="@drawable/action_remove_all"
- android:title="@string/common.delete"
- android:showAsAction="ifRoom|withText"/>
-
- <item
- android:id="@+id/menu_play_last"
- android:icon="@drawable/action_play_all"
- android:title="@string/menu.play_last"
- android:showAsAction="ifRoom|withText"/>
+ android:title="@string/common.delete"/>
</menu>
diff --git a/subsonic-android/res/menu/select_podcasts.xml b/subsonic-android/res/menu/select_podcasts.xml
index e0f9a718..eea03827 100644
--- a/subsonic-android/res/menu/select_podcasts.xml
+++ b/subsonic-android/res/menu/select_podcasts.xml
@@ -7,6 +7,11 @@
android:showAsAction="always|withText"/>
<item
+ android:id="@+id/menu_check"
+ android:icon="@drawable/action_refresh"
+ android:title="@string/menu.check_podcasts"/>
+
+ <item
android:id="@+id/menu_settings"
android:icon="@drawable/action_settings"
android:title="@string/menu.settings"/>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index fa672f82..f67dd9fe 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -21,7 +21,7 @@
<string name="common.play_external">Play Video</string>
<string name="common.stream_external">Stream Video</string>
<string name="common.confirm">Confirm</string>
- <string name="common.confirm_message">Do you want to %1$s %2$s</string>
+ <string name="common.confirm_message">Do you want to %1$s %2$s?</string>
<string name="button_bar.home">Home</string>
<string name="button_bar.browse">Library</string>
@@ -71,6 +71,7 @@
<string name="menu.deleted_playlist_error">Failed to delete playlist %s</string>
<string name="menu.log">Send Log</string>
<string name="menu.set_timer">Set Timer</string>
+ <string name="menu.check_podcasts">Request Server Refresh</string>
<string name="playlist.label">Playlists</string>
<string name="playlist.update_info">Update Information</string>
@@ -134,6 +135,10 @@
<string name="select_podcasts.empty">No podcasts found</string>
<string name="select_podcasts.error">This podcast had an error while downloading on the server. The server must download it first.</string>
<string name="select_podcasts.skipped">This podcast has not been downloaded on the server. The server must download it first.</string>
+ <string name="select_podcasts.server_download">Download on server</string>
+ <string name="select_podcasts.server_delete">Delete from server</string>
+ <string name="select_podcasts.downloading">Now downloading %s on the server</string>
+ <string name="select_podcasts.refreshing">The server is checking for new podcasts now</string>
<string name="select_playlist.empty">No saved playlists on server</string>
@@ -191,6 +196,7 @@
<string name="song_details.kbps">%d kbps</string>
<string name="song_details.error">Error</string>
<string name="song_details.skipped">Skipped</string>
+ <string name="song_details.downloading">Downloading</string>
<string name="lyrics.nomatch">No lyrics found</string>