--- GConf-1.0.9/gconf/gconf-internals.c.errormessage Tue Mar 26 14:07:37 2002 +++ GConf-1.0.9/gconf/gconf-internals.c Tue Mar 26 14:10:21 2002 @@ -2514,11 +2514,23 @@ if (lock_entire_file (fd) < 0) { + /* Jump through some hoops to avoid breaking string freeze */ + char *msg1; + char *msg2; + + msg1 = g_strdup_printf (_("Failed to lock '%s': probably another process has the lock, or your operating system has NFS file locking misconfigured, or a hard NFS client crash caused a stale lock (%s)"), + filename, strerror (errno)); + msg2 = g_strconcat (msg1, " - ", + _("run gconf-sanity-check-1 for possible diagnosis, see http://www.gnome.org/projects/gconf/ for more information"), + NULL); g_set_error (err, GCONF_ERROR, GCONF_ERROR_LOCK_FAILED, - _("Failed to lock '%s': probably another process has the lock, or your operating system has NFS file locking misconfigured, or a hard NFS client crash caused a stale lock (%s)"), - filename, strerror (errno)); + "%s", msg2); + + g_free (msg1); + g_free (msg2); + close (fd); return -1; }