app/core/gimpbrush.c app/core/gimpbrushpipe.c Proofreading to strings,

2001-11-15  Rebecca Walter <rjp@mail.tele.dk>
	* app/core/gimpbrush.c
	* app/core/gimpbrushpipe.c
	* app/core/gimpchannel.c:  Proofreading to strings, approved by Sven

ChangeLog

+2001-11-15  Rebecca Walter <rjp@mail.tele.dk>
+	* app/core/gimpbrush.c
+	* app/core/gimpbrushpipe.c
+	* app/core/gimpchannel.c:  Proofreading to strings, approved by Sven
+
 2001-11-15  Sven Neumann  <sven@gimp.org>
 
 	* RELEASE-TO-CVS.patch: recreated from toplevel dir so it applies

app/core/gimpbrush-load.c

@@ -453,7 +453,8 @@ gimp_brush_load_brush (gint         fd,
   if (header.version != 1 &&
       (header.magic_number != GBRUSH_MAGIC || header.version != 2))
     {
-      g_message (_("Unknown brush format version #%d in \"%s\"."),
+      g_message (_("Fatal parsing error (unknown version %d):\n"
+		   "Brush file '%s'"),
 		 header.version, filename);
       return NULL;
     }
@@ -473,14 +474,15 @@ gimp_brush_load_brush (gint         fd,
       name = g_new (gchar, bn_size);
       if ((read (fd, name, bn_size)) < bn_size)
 	{
-	  g_message (_("Error in GIMP brush file \"%s\"."), filename);
+	  g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
+		     filename);
 	  g_free (name);
 	  return NULL;
 	}
 
       if (!g_utf8_validate (name, -1, NULL))
         {
-          g_message (_("Invalid UTF-8 string in GIMP brush file \"%s\"."), 
+          g_message (_("Invalid UTF-8 string in brush file '%s'."), 
                      filename);
           g_free (name);
           name = NULL;
@@ -500,7 +502,7 @@ gimp_brush_load_brush (gint         fd,
 		temp_buf_data (brush->mask), header.width * header.height) <
 	  header.width * header.height)
 	{
-	  g_message (_("GIMP brush file appears to be truncated: \"%s\"."),
+	  g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
 		     filename);
 	  g_free (name);
 	  g_object_unref (G_OBJECT (brush));
@@ -519,7 +521,7 @@ gimp_brush_load_brush (gint         fd,
 		    + i * 3, 3) != 3 ||
 	      read (fd, temp_buf_data (brush->mask) + i, 1) != 1)
 	    {
-	      g_message (_("GIMP brush file appears to be truncated: \"%s\"."),
+	      g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
 			 filename);
 	      g_free (name);
 	      g_object_unref (G_OBJECT (brush));
@@ -529,9 +531,9 @@ gimp_brush_load_brush (gint         fd,
       break;
 
     default:
-      g_message ("Unsupported brush depth: %d\n"
-		 "in file \"%s\"\n"
-		 "GIMP Brushes must be GRAY or RGBA",
+      g_message ("Unsupported brush depth %d\n"
+		 "in file '%s'.\n"
+		 "GIMP brushes must be GRAY or RGBA.",
 		 header.bytes, filename);
       g_free (name);
       return NULL;
@@ -549,3 +551,7 @@ gimp_brush_load_brush (gint         fd,
 
   return brush;
 }
+
+
+
+

app/core/gimpbrush.c

@@ -453,7 +453,8 @@ gimp_brush_load_brush (gint         fd,
   if (header.version != 1 &&
       (header.magic_number != GBRUSH_MAGIC || header.version != 2))
     {
-      g_message (_("Unknown brush format version #%d in \"%s\"."),
+      g_message (_("Fatal parsing error (unknown version %d):\n"
+		   "Brush file '%s'"),
 		 header.version, filename);
       return NULL;
     }
@@ -473,14 +474,15 @@ gimp_brush_load_brush (gint         fd,
       name = g_new (gchar, bn_size);
       if ((read (fd, name, bn_size)) < bn_size)
 	{
-	  g_message (_("Error in GIMP brush file \"%s\"."), filename);
+	  g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
+		     filename);
 	  g_free (name);
 	  return NULL;
 	}
 
       if (!g_utf8_validate (name, -1, NULL))
         {
-          g_message (_("Invalid UTF-8 string in GIMP brush file \"%s\"."), 
+          g_message (_("Invalid UTF-8 string in brush file '%s'."), 
                      filename);
           g_free (name);
           name = NULL;
@@ -500,7 +502,7 @@ gimp_brush_load_brush (gint         fd,
 		temp_buf_data (brush->mask), header.width * header.height) <
 	  header.width * header.height)
 	{
-	  g_message (_("GIMP brush file appears to be truncated: \"%s\"."),
+	  g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
 		     filename);
 	  g_free (name);
 	  g_object_unref (G_OBJECT (brush));
@@ -519,7 +521,7 @@ gimp_brush_load_brush (gint         fd,
 		    + i * 3, 3) != 3 ||
 	      read (fd, temp_buf_data (brush->mask) + i, 1) != 1)
 	    {
-	      g_message (_("GIMP brush file appears to be truncated: \"%s\"."),
+	      g_message (_("Fatal parsing error:\nBrush file '%s' appears truncated."),
 			 filename);
 	      g_free (name);
 	      g_object_unref (G_OBJECT (brush));
@@ -529,9 +531,9 @@ gimp_brush_load_brush (gint         fd,
       break;
 
     default:
-      g_message ("Unsupported brush depth: %d\n"
-		 "in file \"%s\"\n"
-		 "GIMP Brushes must be GRAY or RGBA",
+      g_message ("Unsupported brush depth %d\n"
+		 "in file '%s'.\n"
+		 "GIMP brushes must be GRAY or RGBA.",
 		 header.bytes, filename);
       g_free (name);
       return NULL;
@@ -549,3 +551,7 @@ gimp_brush_load_brush (gint         fd,
 
   return brush;
 }
+
+
+
+

app/core/gimpbrushpipe-load.c

@@ -286,7 +286,7 @@ gimp_brush_pipe_load (const gchar *filename)
   fd = open (filename, O_RDONLY | _O_BINARY);
   if (fd == -1)
     {
-      g_message ("Couldn't open file '%s'", filename);
+      g_message (_("Could not open file '%s'"), filename);
       return NULL;
     }
 
@@ -307,7 +307,7 @@ gimp_brush_pipe_load (const gchar *filename)
         }
       else
         {
-          g_message (_("Invalid UTF-8 string in GIMP brush file \"%s\"."), 
+          g_message (_("Invalid UTF-8 string in GIMP brush file '%s'."), 
                      filename);
           gimp_object_set_name (GIMP_OBJECT (pipe), _("Unnamed"));
         }
@@ -316,7 +316,7 @@ gimp_brush_pipe_load (const gchar *filename)
 
   if (!pipe)
     {
-      g_message ("Couldn't read name for brush pipe from file \"%s\".\n", 
+      g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), 
 		 filename);
       close (fd);
       return NULL;
@@ -334,7 +334,7 @@ gimp_brush_pipe_load (const gchar *filename)
 
   if (num_of_brushes < 1)
     {
-      g_message (_("Brush pipes should have at least one brush:\n\"%s\""), 
+      g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), 
 		 filename);
       close (fd);
       g_object_unref (G_OBJECT (pipe));
@@ -422,8 +422,7 @@ gimp_brush_pipe_load (const gchar *filename)
 	}
       else
 	{
-	  g_message (_("Failed to load one of the brushes in the brush pipe\n\"%s\""), 
-		       filename);
+	  g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), filename);
 	  close (fd);
 	  g_object_unref (G_OBJECT (pipe));
 	  return NULL;

app/core/gimpbrushpipe.c

@@ -286,7 +286,7 @@ gimp_brush_pipe_load (const gchar *filename)
   fd = open (filename, O_RDONLY | _O_BINARY);
   if (fd == -1)
     {
-      g_message ("Couldn't open file '%s'", filename);
+      g_message (_("Could not open file '%s'"), filename);
       return NULL;
     }
 
@@ -307,7 +307,7 @@ gimp_brush_pipe_load (const gchar *filename)
         }
       else
         {
-          g_message (_("Invalid UTF-8 string in GIMP brush file \"%s\"."), 
+          g_message (_("Invalid UTF-8 string in GIMP brush file '%s'."), 
                      filename);
           gimp_object_set_name (GIMP_OBJECT (pipe), _("Unnamed"));
         }
@@ -316,7 +316,7 @@ gimp_brush_pipe_load (const gchar *filename)
 
   if (!pipe)
     {
-      g_message ("Couldn't read name for brush pipe from file \"%s\".\n", 
+      g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), 
 		 filename);
       close (fd);
       return NULL;
@@ -334,7 +334,7 @@ gimp_brush_pipe_load (const gchar *filename)
 
   if (num_of_brushes < 1)
     {
-      g_message (_("Brush pipes should have at least one brush:\n\"%s\""), 
+      g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), 
 		 filename);
       close (fd);
       g_object_unref (G_OBJECT (pipe));
@@ -422,8 +422,7 @@ gimp_brush_pipe_load (const gchar *filename)
 	}
       else
 	{
-	  g_message (_("Failed to load one of the brushes in the brush pipe\n\"%s\""), 
-		       filename);
+	  g_message (_("Fatal parsing error:\nBrush pipe file '%s' is corrupt."), filename);
 	  close (fd);
 	  g_object_unref (G_OBJECT (pipe));
 	  return NULL;

app/core/gimpchannel-combine.c

@@ -943,7 +943,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 		  gimp_channel_sub_segment (mask, x1, i, (x2 - x1), 255);
 		  break;
 		default:
-		  g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+		  g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 		  break;
 		}
 	    }
@@ -987,7 +987,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 			  gimp_channel_sub_segment (mask, x0, i, j - x0, last);
 			  break;
 			default:
-			  g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+			  g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 			  break;
 			}
 		    }
@@ -1010,7 +1010,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 		  else if (op == CHANNEL_OP_SUB)
 		    gimp_channel_sub_segment (mask, x0, i, j - x0, last);
 		  else
-		    g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+		    g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 		}
 	    }
 
@@ -1166,7 +1166,7 @@ gimp_channel_combine_mask (GimpChannel *mask,
 				      NULL, 2, &srcPR, &destPR);
       break;
     default:
-      g_message ("Error: unknown opperation type in channel_combine_mask\n");
+      g_warning ("%s: unknown operation type\n", G_GNUC_PRETTY_FUNCTION);
       break;
     }
 

app/core/gimpchannel.c

@@ -943,7 +943,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 		  gimp_channel_sub_segment (mask, x1, i, (x2 - x1), 255);
 		  break;
 		default:
-		  g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+		  g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 		  break;
 		}
 	    }
@@ -987,7 +987,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 			  gimp_channel_sub_segment (mask, x0, i, j - x0, last);
 			  break;
 			default:
-			  g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+			  g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 			  break;
 			}
 		    }
@@ -1010,7 +1010,7 @@ gimp_channel_combine_ellipse (GimpChannel *mask,
 		  else if (op == CHANNEL_OP_SUB)
 		    gimp_channel_sub_segment (mask, x0, i, j - x0, last);
 		  else
-		    g_warning ("Only ADD, REPLACE and SUB are valid for channel_combine!");
+		    g_warning ("Only ADD, REPLACE, and SUB are valid for channel_combine!");
 		}
 	    }
 
@@ -1166,7 +1166,7 @@ gimp_channel_combine_mask (GimpChannel *mask,
 				      NULL, 2, &srcPR, &destPR);
       break;
     default:
-      g_message ("Error: unknown opperation type in channel_combine_mask\n");
+      g_warning ("%s: unknown operation type\n", G_GNUC_PRETTY_FUNCTION);
       break;
     }