banshee r5119 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Dap/Banshee.Dap/Banshee.Dap

[blorentz svn gnome org]

Author: blorentz
Date: Sun Mar  8 16:30:46 2009
New Revision: 5119
URL: http://svn.gnome.org/viewvc/banshee?rev=5119&view=rev

Log:
2009-03-08  Bertrand Lorentz  <bertrand lorentz gmail com>

	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Patch from
	Alexander Kojevnikov fixing a localization issue with the "Delete From
	Drive" action (BGO #560455).

	* src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs: Do not set the
	"Delete From Drive" label, it's overwritten in TrackActions anyway.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	Sun Mar  8 16:30:46 2009
@@ -235,8 +235,9 @@
                     UpdateAction ("AddToPlaylistAction", in_database && primary_source != null &&
                             primary_source.SupportsPlaylists && !primary_source.PlaylistsReadOnly, has_selection, null);
 
-                    if (primary_source != null) {
-                        this["DeleteTracksFromDriveAction"].Label = String.Format (Catalog.GetString ("_Delete From {0}"), primary_source.StorageName);
+                    if (primary_source != null && !(primary_source is LibrarySource)) {
+                        this["DeleteTracksFromDriveAction"].Label = String.Format (
+                            Catalog.GetString ("_Delete From \"{0}\""), primary_source.StorageName);
                     }
                 }
             } else {

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/MediaGroupSource.cs	Sun Mar  8 16:30:46 2009
@@ -52,9 +52,6 @@
             Properties.Set<Gtk.Widget> ("Nereid.SourceContents.FooterWidget", 
                 parent.Properties.Get<Gtk.Widget> ("Nereid.SourceContents.FooterWidget"));
             
-            Properties.Set<string> ("DeleteTracksFromDriveActionLabel", 
-                String.Format (Catalog.GetString ("Delete From {0}"), parent.Name));
-                
             if (this is IPurchasedMusicSource) {
                 PurchasedMusicActions.Create ();