From df96444015ddb6b24dec6b70032357c24c6a3308 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 27 Jan 2014 19:29:11 -0800
Subject: Change to delete_cache to avoid id conflict

---
 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           | 2 +-
 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_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_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 +-
 res/values-es/strings.xml                           | 2 +-
 res/values-hu/strings.xml                           | 2 +-
 res/values-ru/strings.xml                           | 2 +-
 res/values/strings.xml                              | 2 +-
 21 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/res/menu/nowplaying_context.xml b/res/menu/nowplaying_context.xml
index 230de64f..4d0f98e3 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<group android:id="@+id/hide_star">
 		<item
diff --git a/res/menu/nowplaying_context_offline.xml b/res/menu/nowplaying_context_offline.xml
index 0dd0ca47..46611d5c 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<item 
 		android:id="@+id/menu_star"
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index f7467b0f..216e8910 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/menu.download"
+        android:title="@string/common.download"
         />
 		
 	<item 
@@ -41,7 +41,7 @@
 
 	<item 
 		android:id="@+id/album_menu_delete"
-		android:title="@string/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<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 d42e2599..a1805f5b 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -25,7 +25,7 @@
 
 	<item 
 		android:id="@+id/album_menu_delete"
-		android:title="@string/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<item 
 		android:id="@+id/album_menu_star"
diff --git a/res/menu/select_artist_context.xml b/res/menu/select_artist_context.xml
index 8a6de3c8..debc07c6 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<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 fbd42a9a..17ee97e0 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_bookmark_context.xml b/res/menu/select_bookmark_context.xml
index 2cded5fc..724c4c78 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 		
 	<item 
 		android:id="@+id/bookmark_menu_delete"
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 7377db7c..8a86b49b 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_podcast_episode_context.xml b/res/menu/select_podcast_episode_context.xml
index 4231cf35..2ea7ad5b 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
         
 	<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 7bd3ee42..587d01f7 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 2ce51279..7080768a 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index 9d7c7d37..d5bfc2b2 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 	
 	<item 
 		android:id="@+id/menu_add_playlist"
diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml
index b4c948ee..5621e134 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 	
 	<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 2a636a38..49445876 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<item 
 		android:id="@+id/song_menu_star"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 2ee88511..0b482a5e 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 
 	<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 c459d843..3eda2df7 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/menu/select_video_context_offline.xml b/res/menu/select_video_context_offline.xml
index 6ac53af8..3fea9f5e 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/menu.delete"/>
+		android:title="@string/menu.delete_cache"/>
 </menu>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1d3b76ad..b3e5365f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -81,7 +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="menu.delete_cache">Borrar cache</string>
 
     <string name="playlist.label">Listas de reproducción</string>
 	<string name="playlist.update_info">Actualizar información</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e2bd2aae..153822ee 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -83,7 +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="menu.delete_cache">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>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 943ae938..2671a8b6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -66,7 +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="menu.delete_cache">Удалить кэш</string>
 
     <string name="playlist.label">Списки</string>
 	<string name="playlist.update_info">Изменить информацию</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e155f401..af2b3693 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,7 +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="menu.delete_cache">Delete Cache</string>
 
     <string name="playlist.label">Playlists</string>
 	<string name="playlist.update_info">Update Information</string>
-- 
cgit v1.2.3