glib r6591 - trunk/gio

[wbolster svn gnome org]

Author: wbolster
Date: Mon Feb 25 14:31:19 2008
New Revision: 6591
URL: http://svn.gnome.org/viewvc/glib?rev=6591&view=rev

Log:
2008-02-25  Wouter Bolsterlee  <wbolster svn gnome org>

	* gfile.c (g_file_find_enclosing_mount):
	* ginputstream.c (g_input_stream_set_pending):
	* glocalfile.c (g_local_file_find_enclosing_mount):
	* gmount.c (g_mount_unmount), (g_mount_eject), (g_mount_remount):
	* goutputstream.c (g_output_stream_set_pending):

	Fixup translator comments (#518578).


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gfile.c
   trunk/gio/ginputstream.c
   trunk/gio/glocalfile.c
   trunk/gio/gmount.c
   trunk/gio/goutputstream.c

Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c	(original)
+++ trunk/gio/gfile.c	Mon Feb 25 14:31:19 2008
@@ -1256,10 +1256,9 @@
   if (iface->find_enclosing_mount == NULL)
     {
 
-      /* Translators: This is an error message when trying to find the
-         enclosing (user visible) mount of a file, but none exists. */
-      g_set_error (error, G_IO_ERROR,
-		   G_IO_ERROR_NOT_FOUND,
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+			/* Translators: This is an error message when trying to find the
+			 * enclosing (user visible) mount of a file, but none exists. */
 		   _("Containing mount does not exist"));
       return NULL;
     }

Modified: trunk/gio/ginputstream.c
==============================================================================
--- trunk/gio/ginputstream.c	(original)
+++ trunk/gio/ginputstream.c	Mon Feb 25 14:31:19 2008
@@ -897,11 +897,11 @@
   
   if (stream->priv->pending)
     {
-      /* Translators: This is an error you get if there is already
-	 an operation running against this stream when you try to
-	 start one */
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING,
-		   _("Stream has outstanding operation"));
+		/* Translators: This is an error you get if there is already an
+		 * operation running against this stream when you try to start
+		 * one */
+		 _("Stream has outstanding operation"));
       return FALSE;
     }
   

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Mon Feb 25 14:31:19 2008
@@ -1031,22 +1031,22 @@
 
   if (g_lstat (local->filename, &buf) != 0)
     {
-      /* Translators: This is an error message when trying to find the
-         enclosing (user visible) mount of a file, but none exists. */
-      g_set_error (error, G_IO_ERROR,
-		   G_IO_ERROR_NOT_FOUND,
-		   _("Containing mount does not exist"));
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+		      /* Translators: This is an error message when trying to
+		       * find the enclosing (user visible) mount of a file, but
+		       * none exists. */
+		      _("Containing mount does not exist"));
       return NULL;
     }
 
   mountpoint = find_mountpoint_for (local->filename, buf.st_dev);
   if (mountpoint == NULL)
     {
-      /* Translators: This is an error message when trying to find the
-         enclosing (user visible) mount of a file, but none exists. */
-      g_set_error (error, G_IO_ERROR,
-		   G_IO_ERROR_NOT_FOUND,
-		   _("Containing mount does not exist"));
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+		      /* Translators: This is an error message when trying to
+		       * find the enclosing (user visible) mount of a file, but
+		       * none exists. */
+		      _("Containing mount does not exist"));
       return NULL;
     }
 
@@ -1055,11 +1055,11 @@
   if (mount)
     return mount;
 
-  /* Translators: This is an error message when trying to find the
-     enclosing (user visible) mount of a file, but none exists. */
-  g_set_error (error, G_IO_ERROR,
-	       G_IO_ERROR_NOT_FOUND,
-	       _("Containing mount does not exist"));
+  g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+		  /* Translators: This is an error message when trying to find
+		   * the enclosing (user visible) mount of a file, but none
+		   * exists. */
+		  _("Containing mount does not exist"));
   return NULL;
 }
 

Modified: trunk/gio/gmount.c
==============================================================================
--- trunk/gio/gmount.c	(original)
+++ trunk/gio/gmount.c	Mon Feb 25 14:31:19 2008
@@ -335,13 +335,14 @@
 
   if (iface->unmount == NULL)
     {
-      /* Translators: This is an error message for mount objects
-         that don't implement unmount. */
       g_simple_async_report_error_in_idle (G_OBJECT (mount),
 					   callback, user_data,
 					   G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+					   /* Translators: This is an error
+					    * message for mount objects that
+					    * don't implement unmount. */
 					   _("mount doesn't implement unmount"));
-      
+
       return;
     }
   
@@ -409,11 +410,12 @@
 
   if (iface->eject == NULL)
     {
-      /* Translators: This is an error message for mount objects
-         that don't implement eject. */
       g_simple_async_report_error_in_idle (G_OBJECT (mount),
 					   callback, user_data,
 					   G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+					   /* Translators: This is an error
+					    * message for mount objects that
+					    * don't implement eject. */
 					   _("mount doesn't implement eject"));
       
       return;
@@ -490,11 +492,12 @@
 
   if (iface->remount == NULL)
     { 
-      /* Translators: This is an error message for mount objects
-         that don't implement remount. */
      g_simple_async_report_error_in_idle (G_OBJECT (mount),
 					   callback, user_data,
 					   G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+					   /* Translators: This is an error
+					    * message for mount objects that
+					    * don't implement remount. */
 					   _("mount doesn't implement remount"));
       
       return;

Modified: trunk/gio/goutputstream.c
==============================================================================
--- trunk/gio/goutputstream.c	(original)
+++ trunk/gio/goutputstream.c	Mon Feb 25 14:31:19 2008
@@ -1079,11 +1079,11 @@
   
   if (stream->priv->pending)
     {
-      /* Translators: This is an error you get if there is already
-	 an operation running against this stream when you try to
-	 start one */
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_PENDING,
-		   _("Stream has outstanding operation"));
+		      /* Translators: This is an error you get if there is
+		       * already an operation running against this stream when
+		       * you try to start one */
+		      _("Stream has outstanding operation"));
       return FALSE;
     }