gvfs r1135 - in trunk: . client daemon hal

[alexl svn gnome org]

Author: alexl
Date: Tue Jan 15 11:16:17 2008
New Revision: 1135
URL: http://svn.gnome.org/viewvc/gvfs?rev=1135&view=rev

Log:
2008-01-15  Alexander Larsson  <alexl redhat com>

        * client/gdaemonfile.c:
        * daemon/daemon-main.c:
        * daemon/gvfsbackendcdda.c:
        * daemon/gvfsbackendcomputer.c:
        * daemon/gvfsbackendftp.c:
        * daemon/gvfsbackendlocaltest.c:
        * daemon/gvfsbackendsftp.c:
        * daemon/gvfsbackendsmb.c:
        * daemon/gvfsbackendsmbbrowse.c:
        * daemon/gvfsbackendtrash.c:
        * daemon/gvfsjobsetattribute.c:
        * hal/ghaldrive.c:
	Clean up strings and add translator comments



Modified:
   trunk/ChangeLog
   trunk/client/gdaemonfile.c
   trunk/daemon/daemon-main.c
   trunk/daemon/gvfsbackendcdda.c
   trunk/daemon/gvfsbackendcomputer.c
   trunk/daemon/gvfsbackendftp.c
   trunk/daemon/gvfsbackendlocaltest.c
   trunk/daemon/gvfsbackendsftp.c
   trunk/daemon/gvfsbackendsmb.c
   trunk/daemon/gvfsbackendsmbbrowse.c
   trunk/daemon/gvfsbackendtrash.c
   trunk/daemon/gvfsjobsetattribute.c
   trunk/hal/ghaldrive.c

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Tue Jan 15 11:16:17 2008
@@ -1552,7 +1552,9 @@
 
   g_set_error (error, G_IO_ERROR,
 	       G_IO_ERROR_NOT_FOUND,
-	       _("Containing mount does not exist"));
+  /* translators: this is an error message when there is no user visible "mount" object
+     corresponding to a particular path/uri */
+	       _("Could not find enclosing mount"));
   return NULL;
 }
 

Modified: trunk/daemon/daemon-main.c
==============================================================================
--- trunk/daemon/daemon-main.c	(original)
+++ trunk/daemon/daemon-main.c	Tue Jan 15 11:16:17 2008
@@ -53,7 +53,7 @@
   connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);
   if (connection == NULL)
     {
-      g_printerr (_("Error connecting dbus: %s\n"), derror.message);
+      g_printerr (_("Error connecting to D-Bus: %s\n"), derror.message);
       dbus_error_free (&derror);
       exit (1);
     }

Modified: trunk/daemon/gvfsbackendcdda.c
==============================================================================
--- trunk/daemon/gvfsbackendcdda.c	(original)
+++ trunk/daemon/gvfsbackendcdda.c	Tue Jan 15 11:16:17 2008
@@ -170,6 +170,7 @@
       return;
     }
 
+  /* Translator: %s is the device the disc is inserted into */
   fuse_name = g_strdup_printf (_("Audio Disc on %s"), host);
   display_name = g_strdup_printf (_("Audio Disc"));
   g_vfs_backend_set_stable_name (backend, fuse_name);
@@ -232,7 +233,10 @@
   if (cdda_backend->num_open_files > 0)
     {
       error = g_error_new (G_IO_ERROR, G_IO_ERROR_BUSY, 
-                           _("File system is busy: %d open files"), cdda_backend->num_open_files);
+                           ngettext ("File system is busy: %d open file",
+                                     "File system is busy: %d open files",
+                                     cdda_backend->num_open_files),
+                           cdda_backend->num_open_files);
       g_vfs_job_failed_from_error (G_VFS_JOB (job), error);
       return;
     }
@@ -528,7 +532,8 @@
         {
           g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                             g_io_error_from_errno (errno),
-                            _("Error from paranoia on drive %s"), cdda_backend->device_path);
+                            /* Translators: paranoia is the name of the cd audio reading library */
+                            _("Error from 'paranoia' on drive %s"), cdda_backend->device_path);
           return;
         }
 

Modified: trunk/daemon/gvfsbackendcomputer.c
==============================================================================
--- trunk/daemon/gvfsbackendcomputer.c	(original)
+++ trunk/daemon/gvfsbackendcomputer.c	Tue Jan 15 11:16:17 2008
@@ -638,7 +638,7 @@
       if (file != NULL)
         g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                           G_IO_ERROR_NOT_DIRECTORY,
-                          _("Can't enumerate non-directory"));
+                          _("The file is not a directory"));
       return TRUE;
     }
 
@@ -761,7 +761,7 @@
       else
         g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                           G_IO_ERROR_FAILED,
-                          _("Can't find mount for mounted volume"));
+                          _("Internal error: %s"), "No mount object for mounted volume");
     }
   else
     {

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Tue Jan 15 11:16:17 2008
@@ -110,7 +110,7 @@
     {
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-			_("Invalid mount spec"));
+			_("No hostname specified"));
       return TRUE;
     }
 

Modified: trunk/daemon/gvfsbackendlocaltest.c
==============================================================================
--- trunk/daemon/gvfsbackendlocaltest.c	(original)
+++ trunk/daemon/gvfsbackendlocaltest.c	Tue Jan 15 11:16:17 2008
@@ -100,7 +100,7 @@
 	  g_print ("(II) inject_error: BANG! injecting error... \n");
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-			_("Injected error"));
+			"Injected error");
   } else g_vfs_job_succeeded (job); 
 }
 
@@ -784,7 +784,7 @@
     }
   else
     {
-	  g_print ("  (EE) create_dir_file_monitor: monitor == NULL \n");
+      g_print ("  (EE) create_dir_file_monitor: monitor == NULL \n");
       g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
                         G_IO_ERROR_NOT_SUPPORTED,
                         _("Directory notification not supported"));

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Tue Jan 15 11:16:17 2008
@@ -1126,6 +1126,7 @@
   g_vfs_backend_set_mount_spec (backend, sftp_mount_spec);
   g_mount_spec_unref (sftp_mount_spec);
 
+  /* Translators: This is the name of an sftp share, like "sftp on <hostname>" */
   display_name = g_strdup_printf (_("sftp on %s"), op_backend->host);
   g_vfs_backend_set_display_name (backend, display_name);
   g_free (display_name);
@@ -1160,7 +1161,7 @@
     {
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
-			_("Invalid mount spec"));
+			_("No hostname specified"));
       return TRUE;
     }
 

Modified: trunk/daemon/gvfsbackendsmb.c
==============================================================================
--- trunk/daemon/gvfsbackendsmb.c	(original)
+++ trunk/daemon/gvfsbackendsmb.c	Tue Jan 15 11:16:17 2008
@@ -176,8 +176,9 @@
       if (backend->user == NULL)
 	flags |= G_ASK_PASSWORD_NEED_USERNAME;
 
+      /* translators: First %s is a share name, second is a server name */
       message = g_strdup_printf (_("Password required for share %s on %s"),
-				 server_name, share_name);
+				 share_name, server_name);
       handled = g_mount_source_ask_password (backend->mount_source,
 					     message,
 					     username_out,
@@ -425,7 +426,7 @@
     {
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_FAILED,
-			_("Failed to allocate smb context"));
+			_("Internal Error (%s)"), "Failed to allocate smb context");
       return;
     }
   smbc_option_set (smb_context, "user_data", backend);
@@ -460,13 +461,14 @@
     {
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_FAILED,
-			_("Failed to initialize smb context"));
+			_("Internal Error (%s)"), "Failed to initialize smb context");
       smbc_free_context (smb_context, FALSE);
       return;
     }
 
   op_backend->smb_context = smb_context;
 
+  /* Translators: This is "<sharename> on <servername>" and is used as name for an SMB share */
   display_name = g_strdup_printf (_("%s on %s"), op_backend->share, op_backend->server);
   g_vfs_backend_set_display_name (backend, display_name);
   g_free (display_name);
@@ -512,7 +514,8 @@
       op_backend->mount_source = NULL;
       g_vfs_job_failed (G_VFS_JOB (job),
 			G_IO_ERROR, G_IO_ERROR_FAILED,
-			_("Failed to mount smb share"));
+			/* translators: We tried to mount a windows (samba) share, but failed */
+			_("Failed to mount Windows share"));
       return;
     }
   

Modified: trunk/daemon/gvfsbackendsmbbrowse.c
==============================================================================
--- trunk/daemon/gvfsbackendsmbbrowse.c	(original)
+++ trunk/daemon/gvfsbackendsmbbrowse.c	Tue Jan 15 11:16:17 2008
@@ -679,6 +679,8 @@
     }
   else
     {
+      /* translators: Name for the location that lists the smb shares
+	 availible on a server (%s is the name of the server) */
       display_name = g_strdup_printf (_("Windows shares on %s"), op_backend->server);
       browse_mount_spec = g_mount_spec_new ("smb-server");
       g_mount_spec_set (browse_mount_spec, "server", op_backend->server);

Modified: trunk/daemon/gvfsbackendtrash.c
==============================================================================
--- trunk/daemon/gvfsbackendtrash.c	(original)
+++ trunk/daemon/gvfsbackendtrash.c	Tue Jan 15 11:16:17 2008
@@ -592,7 +592,8 @@
 {
   GVfsBackend *backend = G_VFS_BACKEND (trash_backend);
   GMountSpec *mount_spec;
-  
+
+  /* translators: This is the name of the backend */
   g_vfs_backend_set_display_name (backend, _("Trashcan"));
   g_vfs_backend_set_icon_name (backend, "user-trash");
   g_vfs_backend_set_user_visible (backend, FALSE);  

Modified: trunk/daemon/gvfsjobsetattribute.c
==============================================================================
--- trunk/daemon/gvfsjobsetattribute.c	(original)
+++ trunk/daemon/gvfsjobsetattribute.c	Tue Jan 15 11:16:17 2008
@@ -120,7 +120,7 @@
     {
       reply = dbus_message_new_error (message,
 				      DBUS_ERROR_FAILED,
-                                      _("Failed to demarshal message"));
+                                      _("Invalid dbus message"));
       dbus_error_free (&derror);
 
       dbus_connection_send (connection, reply, NULL);

Modified: trunk/hal/ghaldrive.c
==============================================================================
--- trunk/hal/ghaldrive.c	(original)
+++ trunk/hal/ghaldrive.c	Tue Jan 15 11:16:17 2008
@@ -171,8 +171,12 @@
         second = _("Blu-ray-RE");
       
       if (second != NULL) {
+        /* translators: This wis something like "CD-ROM/DVD Drive" or
+           "CD-RW/Blue-ray Drive" depending on the properties of the drive */
         s = g_strdup_printf (_("%s/%s Drive"), first, second);
       } else {
+        /* translators: This wis something like "CD-ROM Drive" or "CD-RW Drive
+           depending on the properties of the drive */
         s = g_strdup_printf (_("%s Drive"), first);
       }
     }