banshee r3147 - in trunk/banshee: . src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Core/Banshee.Configuration.Schema src/Core/Banshee.Services/Banshee.Collection.Database

[scottp svn gnome org]

Author: scottp
Date: Tue Feb  5 04:14:09 2008
New Revision: 3147
URL: http://svn.gnome.org/viewvc/banshee?rev=3147&view=rev

Log:
* src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs:
* src/Core/Banshee.Core/Banshee.Configuration.Schema/LibrarySchema.cs:
* src/Core/Banshee.Core/Banshee.Base/SafeUri.cs: Standardized
  venacular around "Location" rather than "Path" when refering to the
  file URI in user-facing strings (BGO 436453)

Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Configuration.Schema/LibrarySchema.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/SafeUri.cs	Tue Feb  5 04:14:09 2008
@@ -95,7 +95,7 @@
             GLib.Marshaller.Free (uri_ptr);
             
             if (path_ptr == IntPtr.Zero) {
-                throw new ApplicationException ("URI could not be converted to local file path");
+                throw new ApplicationException ("URI could not be converted to local file location");
             }
             
             string path = GLib.Marshaller.Utf8PtrToString (path_ptr);

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Configuration.Schema/LibrarySchema.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Configuration.Schema/LibrarySchema.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Configuration.Schema/LibrarySchema.cs	Tue Feb  5 04:14:09 2008
@@ -45,7 +45,7 @@
             Banshee.Base.FileNamePattern.DefaultFolder,
             "Library Folder Pattern",
             "Format for creating a track folder inside the library. Do not create an absolute path. " +
-                "Path here is relative to the Banshee music directory. See LibraryLocation. Legal tokens: " +
+                "Location here is relative to the Banshee music directory. See LibraryLocation. Legal tokens: " +
                 "%artist%, %album%, %title%, %track_number%, %track_count%, %track_number_nz% (No prefixed zero), " + 
                 "%track_count_nz% (No prefixed zero), %path_sep% (portable directory separator (/))."
         );

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/TrackListDatabaseModel.cs	Tue Feb  5 04:14:09 2008
@@ -504,7 +504,7 @@
                 "size", "filesize"
             ),
             new QueryField (
-                "uri", Catalog.GetString ("File Path"), "CoreTracks.Uri",
+                "uri", Catalog.GetString ("File Location"), "CoreTracks.Uri",
                 // Translators: These are unique search fields.  Please, no spaces. Blank ok.
                 Catalog.GetString ("uri"), Catalog.GetString ("path"), Catalog.GetString ("file"), Catalog.GetString ("location"),
                 "uri", "path", "file", "location"