lots of i18n updates and spelling corrections

--Sven

ChangeLog

+2000-03-27  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/gap/gap_*.c: corrected spelling and punctuation of many
+	strings so they adhere better to our standards.
+
+	* plug-ins/FractalExplorer/FractalExplorer.c
+	* plug-ins/gflare/gflare.c: do not hardcode ~/.gimp-1.1 into the
+	message strings.
+
 2000-03-27  Shirasaki Yasuhiro  <yasuhiro@gnome.gr.jp>
 
 	* plug-ins/common/xpm.c: INIT_I18N_UI() instead of INIT_I18N()

plug-ins/FractalExplorer/FractalExplorer.c

@@ -1153,7 +1153,7 @@ plug_in_parse_fractalexplorer_path (void)
       g_message (_("No fractalexplorer-path in gimprc:\n"
 		   "You need to add an entry like\n"
 		   "(fractalexplorer-path \"${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer\")\n"
-		   "to your ~/.gimp-1.1/gimprc file\n"));
+		   "to your %s/gimprc file."), gimp_directory ());
       gimp_destroy_params (return_vals, nreturn_vals);
       return;
     }

plug-ins/gap/gap_arr_dialog.c

@@ -463,7 +463,7 @@ radio_create_value(char *title, GtkTable *table, int row, t_arr_arg *arr_ptr)
 
 
   label = gtk_label_new(title);
-  gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+  gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
   gtk_table_attach( GTK_TABLE (table), label, 0, 1, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show(label);
 
@@ -780,7 +780,7 @@ gint p_array_std_dialog(char *title_txt,
   if(b_argc < 1)
   {
      /* if no buttons are specified use one CLOSE button per default */
-     button = gtk_button_new_with_label ( _("CLOSE"));
+     button = gtk_button_new_with_label ( _("Close"));
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
      gtk_signal_connect (GTK_OBJECT (button), "clicked",
                          (GtkSignalFunc) but_array_callback,
@@ -794,21 +794,23 @@ gint p_array_std_dialog(char *title_txt,
   if (frame_txt == NULL)   frame = gtk_frame_new ( _("Enter Values"));
   else                     frame = gtk_frame_new (frame_txt);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_container_border_width (GTK_CONTAINER (frame), 4);
+  gtk_container_border_width (GTK_CONTAINER (frame), 6);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (g_arrint.dlg)->vbox), frame, TRUE, TRUE, 0);
 
   if(argc > 0)
   {
     /* table (one row per argv) */
     table = gtk_table_new (argc +1, 3, FALSE);
-    gtk_container_border_width (GTK_CONTAINER (table), 2);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 2);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 4);
     gtk_container_add (GTK_CONTAINER (frame), table);
 
     for(l_idx = 0; l_idx < argc; l_idx++)
     {
        arr_ptr = &argv[l_idx];
 
-       if(arr_ptr->label_txt == NULL)  l_label_txt = _("Value: ");
+       if(arr_ptr->label_txt == NULL)  l_label_txt = _("Value:");
        else                            l_label_txt = arr_ptr->label_txt;
 
        switch(arr_ptr->widget_type)

plug-ins/gap/gap_decode_mpeg_main.c

@@ -143,7 +143,7 @@ query ()
     { PARAM_DRAWABLE, "drawable", "(unused)"},
     { PARAM_STRING, "filename", "The name of the file to load" },
     { PARAM_STRING, "raw_filename", "The name entered" },
-    { PARAM_INT32, "first_frame", "1.st frame to extract (starting at number 1)" },
+    { PARAM_INT32, "first_frame", "1st frame to extract (starting at number 1)" },
     { PARAM_INT32, "last_frame", "last frame to extract (use 0 to load all remaining frames)" },
     { PARAM_STRING, "animframe_basename", "The name for the single frames _0001.xcf is added" },
     { PARAM_INT32, "autoload", "TRUE: load 1.st extracted frame on success" },
@@ -160,7 +160,7 @@ query ()
     { PARAM_INT32, "run_mode", "Interactive, non-interactive" },
     { PARAM_STRING, "filename", "The name of the file to load" },
     { PARAM_STRING, "raw_filename", "The name entered" },
-    { PARAM_INT32, "first_frame", "1.st frame to extract (starting at number 1)" },
+    { PARAM_INT32, "first_frame", "1st frame to extract (starting at number 1)" },
     { PARAM_INT32, "last_frame", "last frame to extract (use 0 to load all remaining frames)" },
     { PARAM_STRING, "animframe_basename", "The name for the single frames _0001.xcf is added" },
     { PARAM_INT32, "autoload", "TRUE: load 1.st extracted frame on success" },
@@ -329,18 +329,18 @@ p_overwrite_dialog(char *filename, gint overwrite_mode)
   {
     if (overwrite_mode < 1)
     {
-       l_argv[0].but_txt  = _("OVERWRITE frame");
+       l_argv[0].but_txt  = _("Overwrite Frame");
        l_argv[0].but_val  = 0;
-       l_argv[1].but_txt  = _("OVERWRITE all");
+       l_argv[1].but_txt  = _("Overwrite All");
        l_argv[1].but_val  = 1;
-       l_argv[2].but_txt  = _("CANCEL");
+       l_argv[2].but_txt  = _("Cancel");
        l_argv[2].but_val  = -1;
 
        p_init_arr_arg(&argv[0], WGT_LABEL);
        argv[0].label_txt = filename;
     
        return(p_array_std_dialog ( _("GAP Question"),
-                                   _("File already exists:"),
+                                   _("File already exists"),
 				   1, argv,
 				   3, l_argv, -1));
     }
@@ -434,7 +434,7 @@ load_image (char   *filename,
 
 
   
-  gimp_progress_init (_("Decoding MPEG movie..."));
+  gimp_progress_init (_("Decoding MPEG Movie..."));
 
   fp = fopen(filename,"rb");
   if (fp == NULL)
@@ -529,7 +529,7 @@ load_image (char   *filename,
        }
     
        if (delay > 0)
-         layername = g_strdup_printf("Frame %d (%dms)",
+         layername = g_strdup_printf("Frame %d (%dms)"),
                  framenumber, delay);
        else
          layername = g_strdup_printf("Frame %d",
@@ -640,17 +640,17 @@ load_range_dialog(gint32 *first_frame,
 
   p_init_arr_arg(&argv[0], WGT_FILESEL);
   argv[0].label_txt = _("Video");
-  argv[0].help_txt  = _("Name of the MPEG1 videofile to READ\n"
-                        "frames are extracted from the videofile\n"
-			"and written to seprate diskfiles\n"
-			"Audiotracks in the videofile are ignored");
+  argv[0].help_txt  = _("Name of the MPEG1 videofile to READ.\n"
+                        "Frames are extracted from the videofile\n"
+			"and written to seperate diskfiles.\n"
+			"Audiotracks in the videofile are ignored.");
   argv[0].text_buf_len = len_filename;
   argv[0].text_buf_ret = filename;
   argv[0].entry_width = 250;
 
   p_init_arr_arg(&argv[1], WGT_INT_PAIR);
-  argv[1].label_txt = _("From");
-  argv[1].help_txt  = _("Framenumber of 1.st frame to extract");
+  argv[1].label_txt = _("From:");
+  argv[1].help_txt  = _("Framenumber of 1st frame to extract");
   argv[1].constraint = FALSE;
   argv[1].int_min    = 1;
   argv[1].int_max    = 9999;
@@ -659,7 +659,7 @@ load_range_dialog(gint32 *first_frame,
   argv[1].entry_width = 80;
   
   p_init_arr_arg(&argv[2], WGT_INT_PAIR);
-  argv[2].label_txt = _("To");
+  argv[2].label_txt = _("To:");
   argv[2].help_txt  = _("Framenumber of last frame to extract");
   argv[2].constraint = FALSE;
   argv[2].int_min    = 1;
@@ -669,7 +669,7 @@ load_range_dialog(gint32 *first_frame,
   argv[2].entry_width = 80;
   
   p_init_arr_arg(&argv[3], WGT_FILESEL);
-  argv[3].label_txt = _("Framenames");
+  argv[3].label_txt = _("Framenames:");
   argv[3].help_txt  = _("Basename for the AnimFrames to write on disk\n"
                         "(framenumber and .xcf is added)");
   argv[3].text_buf_len = len_basename;
@@ -678,14 +678,16 @@ load_range_dialog(gint32 *first_frame,
   
   p_init_arr_arg(&argv[4], WGT_TOGGLE);
   argv[4].label_txt = _("Open");
-  argv[4].help_txt  = _("Open the 1.st one of the extracted frames");
+  argv[4].help_txt  = _("Open the 1st one of the extracted frames");
   argv[4].int_ret    = 1;
   
   p_init_arr_arg(&argv[5], WGT_LABEL_LEFT);
-  argv[5].label_txt = _("\nWARNING: do not attempt to split other files than MPEG1 videos\n"
-                         "before you proceed, you should save all open images");
+  argv[5].label_txt = _("\nWARNING: Do not attempt to split other files than MPEG1 videos.\n"
+                         "Before you proceed, you should save all open images.");
   
-  if(TRUE == p_array_dialog("Split MPEG1 Video to Frames", "Select Framerange", ARGC_DIALOG, argv))
+  if(TRUE == p_array_dialog (_("Split MPEG1 Video to Frames"), 
+			     _("Select Framerange"), 
+			     ARGC_DIALOG, argv))
   {
      *first_frame = (long)(argv[1].int_ret);
      *last_frame  = (long)(argv[2].int_ret);

plug-ins/gap/gap_decode_xanim.c

@@ -172,7 +172,7 @@ p_xanim_info(char *errlist)
   l_idx++;
 
   /* the  Action Button */
-    b_argv[0].but_txt  = _("CANCEL");
+    b_argv[0].but_txt  = _("Cancel");
     b_argv[0].but_val  = -1;
     b_argv[1].but_txt  = _("OK");
     b_argv[1].but_val  = 0;
@@ -207,21 +207,21 @@ p_xanim_dialog   (gint32 *first_frame,
 {
 #define XADIALOG_NUM_ARGS 12
   static t_arr_arg  argv[XADIALOG_NUM_ARGS];
-  static char *radio_args[3]  = { N_("XCF"), N_("PPM"), N_("JPEG") };
+  static char *radio_args[3]  = { "XCF", "PPM", "JPEG" };
 
   p_init_arr_arg(&argv[0], WGT_FILESEL);
   argv[0].label_txt = _("Video:");
-  argv[0].help_txt  = _("Name of a videofile to READ by xanim\n"
-                        "frames are extracted from the videofile\n"
-			"and written to seprate diskfiles\n"
-			"xanim exporting edition is required");
+  argv[0].help_txt  = _("Name of a videofile to READ by xanim.\n"
+                        "Frames are extracted from the videofile\n"
+			"and written to seprate diskfiles.\n"
+			"xanim exporting edition is required.");
   argv[0].text_buf_len = len_filename;
   argv[0].text_buf_ret = filename;
   argv[0].entry_width = 250;
 
   p_init_arr_arg(&argv[1], WGT_INT_PAIR);
-  argv[1].label_txt = _("From :");
-  argv[1].help_txt  = _("Framenumber of 1.st frame to extract");
+  argv[1].label_txt = _("From:");
+  argv[1].help_txt  = _("Framenumber of 1st frame to extract");
   argv[1].constraint = FALSE;
   argv[1].int_min    = 0;
   argv[1].int_max    = 9999;
@@ -230,7 +230,7 @@ p_xanim_dialog   (gint32 *first_frame,
   argv[1].entry_width = 80;
   
   p_init_arr_arg(&argv[2], WGT_INT_PAIR);
-  argv[2].label_txt = _("To :");
+  argv[2].label_txt = _("To:");
   argv[2].help_txt  = _("Framenumber of last frame to extract");
   argv[2].constraint = FALSE;
   argv[2].int_min    = 0;
@@ -268,7 +268,7 @@ p_xanim_dialog   (gint32 *first_frame,
   
   p_init_arr_arg(&argv[7], WGT_INT_PAIR);
   argv[7].label_txt = _("Jpeg Quality:");
-  argv[7].help_txt  = _("Quality for resulting jpeg frames\n"
+  argv[7].help_txt  = _("Quality for resulting Jpeg frames\n"
                         "(is ignored when other formats are used)");
   argv[7].constraint = TRUE;
   argv[7].int_min    = 0;
@@ -280,7 +280,7 @@ p_xanim_dialog   (gint32 *first_frame,
 
   p_init_arr_arg(&argv[9], WGT_TOGGLE);
   argv[9].label_txt = _("Open");
-  argv[9].help_txt  = _("Open the 1.st one of the extracted frames");
+  argv[9].help_txt  = _("Open the 1st one of the extracted frames");
   argv[9].int_ret   = 1;
 
   p_init_arr_arg(&argv[10], WGT_TOGGLE);
@@ -290,8 +290,8 @@ p_xanim_dialog   (gint32 *first_frame,
   argv[10].int_ret   = 1;
 
   p_init_arr_arg(&argv[11], WGT_LABEL_LEFT);
-  argv[11].label_txt = _("\nWarning: xanim 2.80 has just limited MPEG support\n"
-                        "most of the frames (type P and B) will be skipped");
+  argv[11].label_txt = _("\nWarning: xanim 2.80 has only limited MPEG support.\n"
+			 "Most of the frames (type P and B) will be skipped.");
    
   if(TRUE == p_array_dialog(_("Split any Xanim readable Video to Frames"), 
 			    _("Select Frame range"), XADIALOG_NUM_ARGS, argv))
@@ -333,18 +333,18 @@ p_overwrite_dialog(char *filename, gint overwrite_mode)
   {
     if (overwrite_mode < 1)
     {
-       l_argv[0].but_txt  = _("OVERWRITE frame");
+       l_argv[0].but_txt  = _("Overwrite Frame");
        l_argv[0].but_val  = 0;
-       l_argv[1].but_txt  = _("OVERWRITE all");
+       l_argv[1].but_txt  = _("Overwrite All");
        l_argv[1].but_val  = 1;
-       l_argv[2].but_txt  = _("CANCEL");
+       l_argv[2].but_txt  = _("Cancel");
        l_argv[2].but_val  = -1;
 
        p_init_arr_arg(&argv[0], WGT_LABEL);
        argv[0].label_txt = filename;
     
        return(p_array_std_dialog ( _("GAP Question"),
-                                   _("File already exists:"),
+                                   _("File already exists"),
 				   1, argv,
 				   3, l_argv, -1));
     }
@@ -431,7 +431,7 @@ p_convert_frames(gint32 frame_from, gint32 frame_to, char *basename, char *ext,
    gint32           l_tmp_image_id;
    char             l_first_xa_frame[200];
 
-  /* load 1.st one of those frames generated by xanim  */
+  /* load 1st one of those frames generated by xanim  */
    p_build_xanim_framename(l_first_xa_frame, frame_from, ext);
    l_tmp_image_id = p_load_image(l_first_xa_frame);
 

plug-ins/gap/gap_filter_foreach.c

@@ -150,11 +150,11 @@ static gint p_pitstop(GRunModeType run_mode, char *plugin_name, gint text_flag,
       }
       if(text_flag == 0)
       {
-         l_msg = g_strdup_printf (_("2.nd call of %s\n(define end-settings)"), plugin_name);
+         l_msg = g_strdup_printf (_("2nd call of %s\n(define end-settings)"), plugin_name);
       }
       else
       {
-         l_msg = g_strdup_printf (_("Non-Interactive call of %s\n(for all layers inbetween)"), plugin_name);
+         l_msg = g_strdup_printf (_("Non-Interactive call of %s\n(for all layers in between)"), plugin_name);
          l_but_argc = 3;
          l_argc = 1;
       }

plug-ins/gap/gap_lib.c

@@ -212,7 +212,7 @@ void p_msg_win(GRunModeType run_mode, char *msg)
   static t_but_arg  l_argv[1];
   int               l_argc;  
   
-  l_argv[0].but_txt  = "CANCEL";
+  l_argv[0].but_txt  = _("OK");
   l_argv[0].but_val  = 0;
   l_argc             = 1;
 
@@ -223,7 +223,7 @@ void p_msg_win(GRunModeType run_mode, char *msg)
        fwrite(msg, 1, strlen(msg), stderr);
        fputc('\n', stderr);
 
-       if(run_mode == RUN_INTERACTIVE) p_buttons_dialog  ("GAP Message", msg, l_argc, l_argv, -1);
+       if(run_mode == RUN_INTERACTIVE) p_buttons_dialog  (_("GAP Message"), msg, l_argc, l_argv, -1);
     }
   }
 }    /* end  p_msg_win */
@@ -886,7 +886,8 @@ int p_chk_framechange(t_anim_info *ainfo_ptr)
     else
     {
        p_msg_win(ainfo_ptr->run_mode,
-         "OPERATION CANCELLED\n(current frame changed while dialog was open)\n");
+         _("OPERATION CANCELLED.\n"
+	   "Current frame changed while dialog was open."));
     }
     p_free_ainfo(&l_ainfo_ptr);
   }
@@ -907,7 +908,10 @@ int p_chk_framerange(t_anim_info *ainfo_ptr)
   if(ainfo_ptr->frame_cnt == 0)
   {
      p_msg_win(ainfo_ptr->run_mode,
-       "OPERATION CANCELLED\nGAP-plugins works only with filenames\nthat ends with _0001.xcf\n==> rename your image, then try again");
+	       _("OPERATION CANCELLED.\n"
+		 "GAP-plugins works only with filenames\n"
+		 "that end with _0001.xcf.\n"
+		 "==> Rename your image, then try again."));
      return -1;
   }
   return 0;
@@ -991,7 +995,9 @@ int p_decide_save_as(gint32 image_id, char *sav_name)
   int               l_save_as_mode;
   GRunModeType      l_run_mode;  
 
-  l_msg = _("You are using a file format != xcf\nSave Operations may result\nin loss of layer information");
+  l_msg = _("You are using a file format != xcf\n"
+	    "Save Operations may result\n"
+	    "in loss of layer information.");
   /* check if there are SAVE_AS_MODE settings (from privious calls within one gimp session) */
   l_save_as_mode = -1;
   /* g_snprintf(l_save_as_name, sizeof(l_save_as_name), "plug_in_gap_plugins_SAVE_AS_MODE_%d", (int)image_id);*/
@@ -1003,11 +1009,11 @@ int p_decide_save_as(gint32 image_id, char *sav_name)
     /* no defined value found (this is the 1.st call for this image_id)
      * ask what to do with a 3 Button dialog
      */
-    l_argv[0].but_txt  = _("CANCEL");
+    l_argv[0].but_txt  = _("Cancel");
     l_argv[0].but_val  = -1;
-    l_argv[1].but_txt  = _("SAVE Flattened");
+    l_argv[1].but_txt  = _("Save Flattened");
     l_argv[1].but_val  = 1;
-    l_argv[2].but_txt  = _("SAVE As Is");
+    l_argv[2].but_txt  = _("Save As Is");
     l_argv[2].but_val  = 0;
     l_argc             = 3;
 
@@ -1477,8 +1483,7 @@ int p_del(t_anim_info *ainfo_ptr, long cnt)
      {
         gchar *tmp_errtxt;
 	
-        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld\n")
-               , l_hi, l_lo);
+        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld") ,l_hi, l_lo);
         p_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
 	g_free(tmp_errtxt);
         return -1;
@@ -1583,7 +1588,7 @@ int p_dup(t_anim_info *ainfo_ptr, long cnt, long range_from, long range_to)
    l_percentage = 0.0;  
    if(ainfo_ptr->run_mode == RUN_INTERACTIVE)
    { 
-     gimp_progress_init( _("Duplicating frames .."));
+     gimp_progress_init( _("Duplicating frames..."));
    }
 
    /* rename (renumber) all frames with number greater than current
@@ -1595,7 +1600,7 @@ int p_dup(t_anim_info *ainfo_ptr, long cnt, long range_from, long range_to)
      if(0 != p_rename_frame(ainfo_ptr, l_lo, l_hi))
      {
         gchar *tmp_errtxt;
-        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld\n"), l_lo, l_hi);
+        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), l_lo, l_hi);
         p_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
 	g_free(tmp_errtxt);
         return -1;
@@ -1674,21 +1679,21 @@ int p_exchg(t_anim_info *ainfo_ptr, long dest)
    /* rename (renumber) frames */
    if(0 != p_rename_frame(ainfo_ptr, dest, l_tmp_nr))
    {
-        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld\n"), dest, l_tmp_nr);
+        tmp_errtxt = g_strdup_printf(_("Error: could not rename frame %ld to %ld"), dest, l_tmp_nr);
         p_msg_win(ainfo_ptr->run_mode, tmp_errtxt);
 	g_free(tmp_errtxt);
         return -1;
    }
    if(0 != p_rename_frame