From 0d5836418895d8c9d75bee187b35ded246152d38 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 27 Jan 2014 16:24:45 -0800
Subject: Remove delete ambiguity

---
 res/menu/nowplaying_context.xml                     | 2 +-
 res/menu/nowplaying_context_offline.xml             | 2 +-
 res/menu/select_album_context.xml                   | 4 ++--
 res/menu/select_album_context_offline.xml           | 4 ++--
 res/menu/select_artist_context.xml                  | 2 +-
 res/menu/select_artist_context_offline.xml          | 2 +-
 res/menu/select_bookmark_context.xml                | 2 +-
 res/menu/select_playlist_context.xml                | 4 ++--
 res/menu/select_podcast_episode.xml                 | 2 +-
 res/menu/select_podcast_episode_context.xml         | 2 +-
 res/menu/select_podcast_episode_context_offline.xml | 2 +-
 res/menu/select_podcast_episode_offline.xml         | 2 +-
 res/menu/select_podcasts_context.xml                | 4 ++--
 res/menu/select_share_context.xml                   | 2 +-
 res/menu/select_song.xml                            | 2 +-
 res/menu/select_song_context.xml                    | 2 +-
 res/menu/select_song_context_offline.xml            | 2 +-
 res/menu/select_song_offline.xml                    | 2 +-
 res/menu/select_video_context.xml                   | 2 +-
 res/menu/select_video_context_offline.xml           | 2 +-
 20 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'res/menu')

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>
-- 
cgit v1.2.3