banshee r3488 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Query src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs

[gburt svn gnome org]

Author: gburt
Date: Thu Mar 20 00:32:14 2008
New Revision: 3488
URL: http://svn.gnome.org/viewvc/banshee?rev=3488&view=rev

Log:
2008-03-19  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:
	* src/Core/Banshee.Services/Banshee.Sources/Source.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Lots of 'song'
	to 'item' changes.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs	Thu Mar 20 00:32:14 2008
@@ -66,11 +66,11 @@
         };
 
         public static QueryLimit [] Limits = new QueryLimit [] {
-            new QueryLimit ("songs",   Catalog.GetString("songs"), true),
-            new QueryLimit ("minutes", Catalog.GetString("minutes"), "CoreTracks.Duration", (int) RelativeDateFactor.Minute),
-            new QueryLimit ("hours",   Catalog.GetString("hours"), "CoreTracks.Duration", (int) RelativeDateFactor.Hour),
-            new QueryLimit ("MB",      Catalog.GetString("MB"), "CoreTracks.FileSize", (int) FileSizeFactor.MB),
-            new QueryLimit ("GB",      Catalog.GetString("GB"), "CoreTracks.FileSize", (int) FileSizeFactor.GB)
+            new QueryLimit ("songs",   Catalog.GetString ("items"), true),
+            new QueryLimit ("minutes", Catalog.GetString ("minutes"), "CoreTracks.Duration", (int) RelativeDateFactor.Minute),
+            new QueryLimit ("hours",   Catalog.GetString ("hours"), "CoreTracks.Duration", (int) RelativeDateFactor.Hour),
+            new QueryLimit ("MB",      Catalog.GetString ("MB"), "CoreTracks.FileSize", (int) FileSizeFactor.MB),
+            new QueryLimit ("GB",      Catalog.GetString ("GB"), "CoreTracks.FileSize", (int) FileSizeFactor.GB)
         };
 
         public static QueryField ArtistField = new QueryField (

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	Thu Mar 20 00:32:14 2008
@@ -427,7 +427,7 @@
                 return String.Empty;
             }
             
-            builder.AppendFormat (Catalog.GetPluralString ("{0} song", "{0} songs", count), count);
+            builder.AppendFormat (Catalog.GetPluralString ("{0} item", "{0} items", count), count);
             
             if (this is IDurationAggregator) {
                 builder.Append (", ");

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	Thu Mar 20 00:32:14 2008
@@ -322,7 +322,7 @@
             }
             
             Window.Title = TrackSet.Count > 1 
-                ? String.Format(Catalog.GetString("Editing song {0} of {1}"), index + 1, TrackSet.Count)
+                ? String.Format(Catalog.GetString("Editing item {0} of {1}"), index + 1, TrackSet.Count)
                 : String.Format(Catalog.GetString("Editing {0}"), track.TrackTitle);
        
             if(track.Uri.IsLocalPath) {

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs	Thu Mar 20 00:32:14 2008
@@ -56,23 +56,23 @@
             Add (new ActionEntry [] {
                 new ActionEntry ("PlayPauseAction", "media-playback-start",
                     Catalog.GetString ("_Play"), "space",
-                    Catalog.GetString ("Play or pause the current song"), OnPlayPauseAction),
+                    Catalog.GetString ("Play or pause the current item"), OnPlayPauseAction),
                     
                 new ActionEntry ("NextAction", "media-skip-forward",
                     Catalog.GetString ("_Next"), "N",
-                    Catalog.GetString ("Play the next song"), OnNextAction),
+                    Catalog.GetString ("Play the next item"), OnNextAction),
                     
                 new ActionEntry ("PreviousAction", "media-skip-backward",
                     Catalog.GetString ("Pre_vious"), "B",
-                    Catalog.GetString ("Play the previous song"), OnPreviousAction),
+                    Catalog.GetString ("Play the previous item"), OnPreviousAction),
 
                 new ActionEntry ("SeekToAction", null,
                     Catalog.GetString ("Seek _to..."), "T",
-                    Catalog.GetString ("Seek to a specific location in current song"), OnSeekToAction),
+                    Catalog.GetString ("Seek to a specific location in current item"), OnSeekToAction),
                 
                 new ActionEntry ("RestartSongAction", null,
                     Catalog.GetString ("_Restart Song"), "R",
-                    Catalog.GetString ("Restart the current song"), OnRestartSongAction)
+                    Catalog.GetString ("Restart the current item"), OnRestartSongAction)
             });
             
             Add (new ToggleActionEntry [] {
@@ -83,7 +83,7 @@
                     
                 new ToggleActionEntry ("StopWhenFinishedAction", null,
                     Catalog.GetString ("_Stop When Finished"), "<Shift>space",
-                    Catalog.GetString ("Stop playback after the current song finishes playing"), 
+                    Catalog.GetString ("Stop playback after the current item finishes playing"), 
                     OnStopWhenFinishedAction, false)
             });
 
@@ -125,6 +125,9 @@
                 case PlayerEngineEvent.StartOfStream:
                     TrackInfo track = ServiceManager.PlayerEngine.CurrentTrack; 
                     action_service["Playback.RestartSongAction"].Sensitive = !track.IsLive;
+                    action_service["Playback.RestartSongAction"].Label = (track.MediaAttributes & TrackMediaAttributes.VideoStream) == 0
+                        ? Catalog.GetString ("_Restart Song")
+                        : Catalog.GetString ("_Restart Video");
                     break;
                 case PlayerEngineEvent.EndOfStream:
                     ToggleAction stop_action = (ToggleAction)action_service["Playback.StopWhenFinishedAction"];

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	Thu Mar 20 00:32:14 2008
@@ -97,7 +97,7 @@
 
                 new ActionEntry ("AddToPlaylistAction", null,
                     Catalog.GetString ("Add _to Playlist"), null,
-                    Catalog.GetString ("Append selected songs to playlist or create new playlist from selection"),
+                    Catalog.GetString ("Append selected items to playlist or create new playlist from selection"),
                     OnAddToPlaylistMenu),
 
                 new ActionEntry ("AddToNewPlaylistAction", Stock.New,
@@ -115,14 +115,14 @@
 
                 new ActionEntry ("DeleteTracksFromDriveAction", null,
                     Catalog.GetString ("_Delete From Drive"), null,
-                    Catalog.GetString ("Permanently delete selected song(s) from medium"), OnDeleteTracksFromDrive),
+                    Catalog.GetString ("Permanently delete selected item(s) from medium"), OnDeleteTracksFromDrive),
 
                 new ActionEntry ("RateTracksAction", null,
                     String.Empty, null, null, OnRateTracks),
 
                 new ActionEntry ("SearchMenuAction", Stock.Find,
-                    Catalog.GetString ("_Search for Songs"), null,
-                    Catalog.GetString ("Search for songs matching certain criteria"), null),
+                    Catalog.GetString ("_Search"), null,
+                    Catalog.GetString ("Search for items matching certain criteria"), null),
 
                 new ActionEntry ("SearchForSameAlbumAction", null,
                     Catalog.GetString ("By Matching _Album"), null,
@@ -429,8 +429,8 @@
             if (delete) {
                 header = String.Format (
                     Catalog.GetPluralString (
-                        "Are you sure you want to permanently delete this song?",
-                        "Are you sure you want to permanently delete the selected {0} songs?", selCount
+                        "Are you sure you want to permanently delete this item?",
+                        "Are you sure you want to permanently delete the selected {0} items?", selCount
                     ), selCount
                 );
                 message = Catalog.GetString ("If you delete the selection, it will be permanently lost.");
@@ -439,8 +439,8 @@
                 header = String.Format (Catalog.GetString ("Remove selection from {0}?"), source.Name);
                 message = String.Format (
                     Catalog.GetPluralString (
-                        "Are you sure you want to remove the selected song from your {1}?",
-                        "Are you sure you want to remove the selected {0} songs from your {1}?", selCount
+                        "Are you sure you want to remove the selected item from your {1}?",
+                        "Are you sure you want to remove the selected {0} items from your {1}?", selCount
                     ), selCount, source.GenericName
                 );
                 button_label = "gtk-remove";