summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-10-04 00:12:20 +0000
committerDarin Adler <darin@src.gnome.org>2000-10-04 00:12:20 +0000
commit7b9c610f8c2e043d4fa118acb84c5e747ef3bc87 (patch)
treebbb1b225018ff806e044508f007dd565c85b3f12
parent1f04158c8c4999fbda65d18c7412f94046a13e42 (diff)
downloadnautilus-7b9c610f8c2e043d4fa118acb84c5e747ef3bc87.tar.gz
Fixed window title.NAUTILUS_UIH_MERGE_BASE
-rw-r--r--ChangeLog6
-rw-r--r--components/music/nautilus-music-view.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c50220da3..722880111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-03 Darin Adler <darin@eazel.com>
+
+ * components/music/nautilus-music-view.c:
+ (nautilus_music_view_update_from_uri): Fixed window title.
+
2000-10-03 Maciej Stachowiak <mjs@eazel.com>
* check-THANKS.pl,
@@ -1522,7 +1527,6 @@
Remove warnings from the bootstrap installer. Arlo-ify the
bootstrap installer (over 50% done).
->>>>>>> 1.2126
2000-09-28 John Sullivan <sullivan@eazel.com>
* libnautilus-extensions/nautilus-icon-container.c:
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index a0d06f06b..66e8f0259 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -1285,7 +1285,7 @@ nautilus_music_view_update_from_uri (NautilusMusicView *music_view, const char *
if (result != GNOME_VFS_OK) {
char *path = gnome_vfs_get_local_path_from_uri (uri);
char *message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
- nautilus_error_dialog (message, _("Couldn't read directory"),
+ nautilus_error_dialog (message, _("Can't Read Folder"),
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view))));
g_free (path);
g_free (message);