Merge changes

1 files changed, 31 insertions, 7 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87667e51..52c899e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,13 +22,15 @@
 	<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.empty">None found</string>

 

     <string name="button_bar.home">Home</string>

     <string name="button_bar.browse">Library</string>

     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

-    <string name="button_bar.now_playing">Playing</string>

+    <string name="button_bar.now_playing">Now Playing</string>

 	<string name="button_bar.podcasts">Podcasts</string>

+	<string name="button_bar.bookmarks">Bookmarks</string>

 	<string name="button_bar.chat">Chat</string>

 

     <string name="main.welcome_title">Welcome!</string>

@@ -130,10 +132,8 @@
 	<string name="offline.sync_partial">Successfully synced %1$d of %2$d songs</string>

 	<string name="offline.sync_error">Failed to sync songs</string>

 

-	<string name="select_genre.empty">No genres found</string>

 	<string name="select_genre.blank">Blank</string>

 

-	<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.initializing">This podcast channel is being initialized on the server.  Please reload after a moment.</string>

@@ -147,8 +147,6 @@
 	<string name="select_podcasts.created_error">Failed to add podcast</string>

 	<string name="select_podcasts.invalid_podcast_channel">Invalid podcast channel: %s</string>

 

-    <string name="select_playlist.empty">No saved playlists on server</string>

-

     <string name="download.empty">Playlist is empty</string>

 	<string name="download.shuffle_loading">Shuffle list is loading...</string>

     <string name="download.playerstate_downloading">Downloading - %s</string>

@@ -189,6 +187,8 @@
 	<string name="download.need_download">Video needs to be downloaded first</string>

 	<string name="download.no_streaming_player">No player can play this stream</string>

 	<string name="download.playing_out_of">Playing: %1$d/%2$d</string>

+	<string name="download.save_bookmark_title">Create bookmark</string>

+	<string name="download.save_bookmark">Bookmark created</string>

     

 	<string name="starring_content_starred">Starred \"%s\"</string>

 	<string name="starring_content_unstarred">Unstarred \"%s\"</string>

@@ -198,6 +198,17 @@
 	<string name="updated_playlist">Added %1$s songs to \"%2$s\"</string>

     <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string>

 	<string name="removed_playlist">Removed %1$s songs from \"%2$s\"</string>

+	

+	<string name="bookmark.delete">Delete bookmark</string>

+	<string name="bookmark.delete_title">Delete the bookmark for</string>

+	<string name="bookmark.deleted">Deleted the bookmark for \"%s\"</string>

+	<string name="bookmark.deleted_error">Failed to delete the bookmark for \"%s\"</string>

+	<string name="bookmark.details_title">Bookmark Details</string>

+	<string name="bookmark.details">Song: %1$s

+		\nPosition: %2$s

+		\nCreated: %3$s

+		\nLast Updated: %4$s

+		\nComment: %5$s</string>

 

     <string name="song_details.all">%1$s %2$s</string>

     <string name="song_details.kbps">%d kbps</string>

@@ -290,7 +301,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>

     <string name="settings.other_title">Other settings</string>

     <string name="settings.scrobble_title">Scrobble to Last.fm</string>

-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the DSub server</string>

+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subsonic server</string>

     <string name="settings.hide_media_title">Hide from other</string>

     <string name="settings.hide_media_summary">Hide music files from other apps.</string>

     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>

@@ -311,19 +322,32 @@
 	<string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>

 	<string name="settings.temp_loss_lower">Always lower volume</string>

 	<string name="settings.temp_loss_nothing">Do Nothing</string>

+	<string name="settings.disconnect_pause_title">Pause on Disconnect</string>

+	<string name="settings.disconnect_pause_both">Pause on either</string>

+	<string name="settings.disconnect_pause_headphone">Pause only for headphone</string>

+	<string name="settings.disconnect_pause_bluetooth">Pause only for bluetooth</string>

+	<string name="settings.disconnect_pause_neither">Do Nothing</string>

 	<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.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 tab.  Restart app after changing.</string>

+	<string name="settings.chat_enabled_summary">Whether or not to display the chat listing in the pull out drawer</string>

 	<string name="settings.video_title">Video</string>

 	<string name="settings.video_player">Video Player</string>

 	<string name="settings.video_raw">Raw (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_hls">HTTP Live Stream (HLS) (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>

 	<string name="settings.video_flash">Flash (Requires Plugin)</string>

+	<string name="settings.cache_screen_title">Cache/Network</string>

+	<string name="settings.playback_title">Playback</string>

+	<string name="settings.hide_widget_title">Hide Widget</string>

+	<string name="settings.hide_widget_summary">Hide widget after exiting app</string>

+	<string name="settings.podcasts_enabled">Podcasts Enabled</string>

+	<string name="settings.podcasts_enabled_summary">Whether or not to display the podcast listing in the pull out drawer</string>

+	<string name="settings.bookmarks_enabled">Bookmarks Enabled</string>

+	<string name="settings.bookmarks_enabled_summary">Whether or not to display the bookmarks listing in the pull out drawer</string>

 	<string name="settings.sync_title">Sync</string>

 	<string name="settings.sync_enabled">Sync Enabled</string>

 	<string name="settings.sync_enabled_summary">Whether or not playlists or podcasts are periodically checked for changes</string>