[rygel] core,media-export: Prefer 'folder' over 'directory'

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 71857e9571013decb21a0b67661c84b8c678649c
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Apr 20 01:58:56 2010 +0300

    core,media-export: Prefer 'folder' over 'directory'
    
    Prefer the term 'folder' over 'directory' in strings (possibly) visible to
    the user.

 .../media-export/rygel-media-export-harvester.vala |    2 +-
 .../rygel-media-export-root-container.vala         |    2 +-
 src/rygel/rygel-plugin-loader.vala                 |    2 +-
 src/rygel/rygel-thumbnailer.vala                   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index c647e59..7292f2f 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -130,7 +130,7 @@ public class Rygel.MediaExportHarvester : GLib.Object {
 
             yield enumerator.close_async (Priority.DEFAULT, this.cancellable);
         } catch (Error err) {
-            warning (_("failed to enumerate directory: %s"), err.message);
+            warning (_("failed to enumerate folder: %s"), err.message);
         }
 
         cleanup_database (this.containers.peek_head() as DummyContainer);
diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index eae4290..aa26101 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -47,7 +47,7 @@ public class Rygel.MediaExportRootContainer : Rygel.MediaDBContainer {
 
         // either an error occured or the gconf key is not set
         if (uris.size == 0) {
-            debug(_("Nothing configured, using XDG special directories"));
+            debug(_("Nothing configured, using XDG special folders"));
             UserDirectory[] xdg_directories = { UserDirectory.MUSIC,
                                                 UserDirectory.PICTURES,
                                                 UserDirectory.VIDEOS };
diff --git a/src/rygel/rygel-plugin-loader.vala b/src/rygel/rygel-plugin-loader.vala
index d1875ba..f010126 100644
--- a/src/rygel/rygel-plugin-loader.vala
+++ b/src/rygel/rygel-plugin-loader.vala
@@ -97,7 +97,7 @@ public class Rygel.PluginLoader : Object {
                                                        Priority.DEFAULT,
                                                        null);
         } catch (Error error) {
-            critical (_("Error listing contents of directory '%s': %s"),
+            critical (_("Error listing contents of folder '%s': %s"),
                       dir.get_path (),
                       error.message);
 
diff --git a/src/rygel/rygel-thumbnailer.vala b/src/rygel/rygel-thumbnailer.vala
index 54d79be..7102dc0 100644
--- a/src/rygel/rygel-thumbnailer.vala
+++ b/src/rygel/rygel-thumbnailer.vala
@@ -53,7 +53,7 @@ internal class Rygel.Thumbnailer : GLib.Object {
             file = File.new_for_path (dir);
 
             if (!file.query_exists (null)) {
-                var message = _("Failed to find thumbnails directory.");
+                var message = _("Failed to find thumbnails folder.");
 
                 throw new ThumbnailerError.NO_DIR (message);
             } else {