gvfs r2051 - in branches/gnome-2-24: . daemon

[alexl svn gnome org]

Author: alexl
Date: Thu Oct 16 12:59:39 2008
New Revision: 2051
URL: http://svn.gnome.org/viewvc/gvfs?rev=2051&view=rev

Log:
2008-10-16  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendftp.c:
        (do_mount):
	Show username in auth dialog if specified in uri (#554156)



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/daemon/gvfsbackendftp.c

Modified: branches/gnome-2-24/daemon/gvfsbackendftp.c
==============================================================================
--- branches/gnome-2-24/daemon/gvfsbackendftp.c	(original)
+++ branches/gnome-2-24/daemon/gvfsbackendftp.c	Thu Oct 16 12:59:39 2008
@@ -1339,9 +1339,15 @@
     {
       GAskPasswordFlags flags;
       if (prompt == NULL)
-	/* translators: %s here is the hostname */
-	prompt = g_strdup_printf (_("Enter password for ftp on %s"), host);
-
+	{
+	  if (ftp->has_initial_user)
+	    /* Translators: the first %s is the username, the second the host name */
+	    prompt = g_strdup_printf (_("Enter password for ftp as %s on %s"), ftp->user, host);
+	  else
+	    /* translators: %s here is the hostname */
+	    prompt = g_strdup_printf (_("Enter password for ftp on %s"), host);
+	}
+	  
       flags = G_ASK_PASSWORD_NEED_PASSWORD;
         
       if (!ftp->has_initial_user)