Remove delete ambiguity

24 files changed, 31 insertions, 28 deletions

diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index 57e5bde5..230de64f 100644
--- a/res/menu/nowplaying_context.xml
+++ b/res/menu/nowplaying_context.xml
@@ -20,7 +20,7 @@
 
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/download.menu_delete"/>
+		android:title="@string/menu.delete"/>
 
 	<group android:id="@+id/hide_star">
 		<item
diff --git a/res/menu/nowplaying_context_offline.xml b/res/menu/nowplaying_context_offline.xml
index 77f94bb6..0dd0ca47 100644
--- a/res/menu/nowplaying_context_offline.xml
+++ b/res/menu/nowplaying_context_offline.xml
@@ -16,7 +16,7 @@
 
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/download.menu_delete"/>
+		android:title="@string/menu.delete"/>
 
 	<item 
 		android:id="@+id/menu_star"
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index b1e0e42c..f7467b0f 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -31,7 +31,7 @@
 
     <item 
         android:id="@+id/album_menu_download"
-        android:title="@string/common.download"
+        android:title="@string/menu.download"
         />
 		
 	<item 
@@ -41,7 +41,7 @@
 
 	<item 
 		android:id="@+id/album_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 
 	<item
 		android:id="@+id/album_menu_show_artist"
diff --git a/res/menu/select_album_context_offline.xml b/res/menu/select_album_context_offline.xml
index 9eb5995f..d42e2599 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -25,9 +25,9 @@
 
 	<item 
 		android:id="@+id/album_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 
 	<item 
 		android:id="@+id/album_menu_star"
 		android:title="@string/common.star"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index 2a71cec9..8a6de3c8 100644
--- a/res/menu/select_artist_context.xml
+++ b/res/menu/select_artist_context.xml
@@ -36,7 +36,7 @@
 
 	<item 
 		android:id="@+id/artist_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 
 	<group android:id="@+id/server_1_10">
 		<group android:id="@+id/hide_star">
diff --git a/res/menu/select_artist_context_offline.xml b/res/menu/select_artist_context_offline.xml
index bfd7685a..fbd42a9a 100644
--- a/res/menu/select_artist_context_offline.xml
+++ b/res/menu/select_artist_context_offline.xml
@@ -26,5 +26,5 @@
 
 	<item 
 		android:id="@+id/artist_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/menu/select_bookmark_context.xml b/res/menu/select_bookmark_context.xml
index af11c86f..2cded5fc 100644
--- a/res/menu/select_bookmark_context.xml
+++ b/res/menu/select_bookmark_context.xml
@@ -16,7 +16,7 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 		
 	<item 
 		android:id="@+id/bookmark_menu_delete"
diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml
index 7cdc0c79..47033d9c 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -37,7 +37,7 @@
 	
 	<item 
         android:id="@+id/playlist_menu_delete"
-        android:title="@string/common.delete"
+        android:title="@string/playlist.delete"
         /> 
         
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 8472325a..7377db7c 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -13,5 +13,5 @@
 
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/menu/select_podcast_episode_context.xml b/res/menu/select_podcast_episode_context.xml
index 79eaa04d..4231cf35 100644
--- a/res/menu/select_podcast_episode_context.xml
+++ b/res/menu/select_podcast_episode_context.xml
@@ -31,7 +31,7 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
         
 	<item 
 		android:id="@+id/song_menu_server_download"
diff --git a/res/menu/select_podcast_episode_context_offline.xml b/res/menu/select_podcast_episode_context_offline.xml
index a7dc1619..7bd3ee42 100644
--- a/res/menu/select_podcast_episode_context_offline.xml
+++ b/res/menu/select_podcast_episode_context_offline.xml
@@ -26,5 +26,5 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 4d464c1f..2ce51279 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -9,5 +9,5 @@
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/menu/select_podcasts_context.xml b/res/menu/select_podcasts_context.xml
index 3a2a1c60..5df9d278 100644
--- a/res/menu/select_podcasts_context.xml
+++ b/res/menu/select_podcasts_context.xml
@@ -6,7 +6,7 @@
 		android:title="@string/common.info"/>
 	<item 
 		android:id="@+id/podcast_channel_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/select_podcasts.delete"/>
 
 	<item
 		android:id="@+id/podcast_menu_sync"
@@ -15,4 +15,4 @@
 	<item
 		android:id="@+id/podcast_menu_stop_sync"
 		android:title="@string/menu.stop_sync"/>
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/select_share_context.xml b/res/menu/select_share_context.xml
index 3db445f6..d015beaf 100644
--- a/res/menu/select_share_context.xml
+++ b/res/menu/select_share_context.xml
@@ -17,5 +17,5 @@
 

 	<item

 		android:id="@+id/share_menu_delete"

-		android:title="@string/common.delete"/>

+		android:title="@string/share.delete"/>

 </menu>

diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 38bebb39..9d7c7d37 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -33,7 +33,7 @@
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 	
 	<item 
 		android:id="@+id/menu_add_playlist"
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
index 8a37e0f8..b4c948ee 100644
--- a/res/menu/select_song_context.xml
+++ b/res/menu/select_song_context.xml
@@ -36,7 +36,7 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 	
 	<item 
 		android:id="@+id/song_menu_add_playlist"
diff --git a/res/menu/select_song_context_offline.xml b/res/menu/select_song_context_offline.xml
index 401a9b69..2a636a38 100644
--- a/res/menu/select_song_context_offline.xml
+++ b/res/menu/select_song_context_offline.xml
@@ -26,7 +26,7 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 
 	<item 
 		android:id="@+id/song_menu_star"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index f0ca1cee..2ee88511 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -25,7 +25,7 @@
 		
 	<item 
 		android:id="@+id/menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 
 	<group android:id="@+id/hide_play_next">
 		<item
diff --git a/res/menu/select_video_context.xml b/res/menu/select_video_context.xml
index 084c29aa..c459d843 100644
--- a/res/menu/select_video_context.xml
+++ b/res/menu/select_video_context.xml
@@ -20,5 +20,5 @@
 
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/menu/select_video_context_offline.xml b/res/menu/select_video_context_offline.xml
index 7a9020f5..6ac53af8 100644
--- a/res/menu/select_video_context_offline.xml
+++ b/res/menu/select_video_context_offline.xml
@@ -11,5 +11,5 @@
 		
 	<item 
 		android:id="@+id/song_menu_delete"
-		android:title="@string/common.delete"/>
+		android:title="@string/menu.delete"/>
 </menu>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3cfe6245..d37418ab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -81,6 +81,7 @@
 	<string name="menu.show_all">Mostrar todo el contenido</string>
 	<string name="menu.show_artist">Mostrar artista</string>
 	<string name="menu.share">Compartir</string>
+	<string name="menu.delete">Borrar cache</string>
 
     <string name="playlist.label">Listas de reproducción</string>
 	<string name="playlist.update_info">Actualizar información</string>
@@ -161,7 +162,6 @@
     <string name="download.menu_show_album">Mostrar disco</string>
     <string name="download.menu_lyrics">Letras</string>
     <string name="download.menu_remove">Eliminar de la cola</string>
-	<string name="download.menu_delete">Borrar cache</string>
     <string name="download.menu_remove_all">Borrar todo</string>
     <string name="download.menu_screen_on">Pantalla encendida</string>
     <string name="download.menu_screen_off">Pantalla apagada</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3d29d14d..49eec5e3 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -83,6 +83,7 @@
 	<string name="menu.show_all">Minden média megjelenítése</string>

 	<string name="menu.show_artist">Ugrás az előadóhoz</string>

 	<string name="menu.share">Megosztás</string>

+	<string name="menu.delete">Törlés a gyorsítótárból</string>

 

     <string name="playlist.label">Lejátszási listák</string>

 	<string name="playlist.update_info">Szerkesztés</string>

@@ -165,7 +166,6 @@
     <string name="download.menu_show_album">Ugrás az albumhoz</string>

     <string name="download.menu_lyrics">Dalszöveg</string>

     <string name="download.menu_remove">Eltávolítás a várólistáról</string>

-	<string name="download.menu_delete">Törlés a gyorsítótárból</string>

     <string name="download.menu_remove_all">Összes eltávolítása</string>

     <string name="download.menu_screen_on">Kijelző be</string>

     <string name="download.menu_screen_off">Kijelző ki</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 87667d47..c1bb97de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -66,6 +66,7 @@
 	<string name="menu.deleted_playlist_error">Не удалось удалить список %s</string>

 	<string name="menu.log">Отправить журнал событий</string>

 	<string name="menu.set_timer">Установить таймер</string>

+	<string name="menu.delete">Удалить кэш</string>

 

     <string name="playlist.label">Списки</string>

 	<string name="playlist.update_info">Изменить информацию</string>

@@ -119,7 +120,6 @@
     <string name="download.menu_show_album">Показать альбом</string>

     <string name="download.menu_lyrics">Текст</string>

     <string name="download.menu_remove">Убрать из очереди</string>

-	<string name="download.menu_delete">Удалить кэш</string>

     <string name="download.menu_remove_all">Очистить</string>

     <string name="download.menu_screen_on">Включить подсветку</string>

     <string name="download.menu_screen_off">Отключать подсветку</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5753841..9dd3abc1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,6 +83,7 @@
 	<string name="menu.show_all">Show all media</string>

 	<string name="menu.show_artist">Show Artist</string>

 	<string name="menu.share">Share</string>

+	<string name="menu.delete">Delete Cache</string>

 

     <string name="playlist.label">Playlists</string>

 	<string name="playlist.update_info">Update Information</string>

@@ -91,6 +92,7 @@
 	<string name="playlist.overwrite">Overwrite existing playlist</string>

 	<string name="playlist.add_to">Add to Playlist</string>

 	<string name="playlist.create_new">Create New</string>

+	<string name="playlist.delete">Delete Playlist</string>

 

     <string name="help.label">Help</string>

     <string name="help.title">Welcome to DSub!</string>

@@ -156,6 +158,7 @@
 	<string name="select_podcasts.add_url">URL:</string>

 	<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_podcasts.delete">Delete podcast</string>

 

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

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

@@ -165,7 +168,6 @@
     <string name="download.menu_show_album">Show album</string>

     <string name="download.menu_lyrics">Lyrics</string>

     <string name="download.menu_remove">Remove from queue</string>

-	<string name="download.menu_delete">Delete cache</string>

     <string name="download.menu_remove_all">Remove all</string>

     <string name="download.menu_screen_on">Screen on</string>

     <string name="download.menu_screen_off">Screen off</string>

@@ -422,6 +424,7 @@
 	<string name="share.updated_info">Updated share information for %s</string>

 	<string name="share.updated_info_error">Failed to update share information for %s</string>

 	<string name="share.via">Share via</string>

+	<string name="share.delete">Delete Share</string>

 

     <string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>