--- actions.c.org	Mon Jan 26 08:11:12 2004
+++ actions.c	Sun Feb  8 10:16:49 2004
@@ -604,7 +604,7 @@
 
   if (data)
     add_unmanaged_window(data);
-  else message(" unmanage: at least one argument required ");
+  else message(" unmanage:" MESSAGE_AT_LEAST_ONE_ARGUMENT );
 
   return NULL;
 }
@@ -628,7 +628,7 @@
 
   if (!data)
     {
-      message (" definekey: at least two arguments required ");
+      message (" definekey:" MESSAGE_AT_LEAST_TWO_ARGUMENTS );
       return NULL;
     }
 
@@ -654,7 +654,7 @@
 
   if (!token)
     {
-      message (" definekey: at least two arguments required ");
+      message (" definekey:" MESSAGE_AT_LEAST_TWO_ARGUMENTS );
       free (tmp);
       return NULL;
     }
@@ -1085,7 +1085,7 @@
 
 	  alias_recursive_depth++;
 	  if (alias_recursive_depth >= MAX_ALIAS_RECURSIVE_DEPTH)
-	    message (" command: alias recursion has exceeded maximum depth ");
+	    message (" command:" MESSAGE_ALIAS_RECURSION_MAX );
 	  else
 	    result = command (interactive, sbuf_get (s));
 	  alias_recursive_depth--;
@@ -1378,7 +1378,7 @@
       new_number = string_to_window_number (tmp);
       if (new_number < 0)
 	{
-	  message (" number: invalid argument ");
+	  message (" number:" MESSAGE_INVALID_ARGUMENT );
 	  free (str);
 	  return NULL;
 	}
@@ -1403,7 +1403,7 @@
       win_number = string_to_window_number (tmp);
       if (win_number < 0)
 	{
-	  message (" number: invalid argument ");
+	  message (" number:" MESSAGE_INVALID_ARGUMENT );
 	  free (str);
 	  return NULL;
 	}
@@ -1606,7 +1606,7 @@
   if (pixels > 0)
     h_split_frame (frame, pixels);
   else
-    message (" hsplit: invalid argument ");    
+    message (" hsplit:" MESSAGE_INVALID_ARGUMENT );    
 
   return NULL;
 }
@@ -1628,7 +1628,7 @@
   if (pixels > 0)
     v_split_frame (frame, pixels);
   else
-    message (" vsplit: invalid argument ");    
+    message (" vsplit:" MESSAGE_INVALID_ARGUMENT );    
 
   return NULL;
 }
@@ -1650,7 +1650,7 @@
 
   if (num_frames(s) <= 1)
     {
-      message (" remove: cannot remove only frame ");
+      message (" remove:" MESSAGE_CANNOT_RM_ONLY_FRAME );
       return NULL;
     }
 
@@ -1745,13 +1745,13 @@
       
       if (data == NULL)
 	{
-	  message (" resize: two numeric arguments required ");
+	  message (" resize:" MESSAGE_TWO_NUMERIC_REQUIRED );
 	  return NULL;
 	}
 
       if (sscanf (data, "%d %d", &xdelta, &ydelta) < 2)
 	{
-	  message (" resize: two numeric arguments required ");
+	  message (" resize:" MESSAGE_TWO_NUMERIC_REQUIRED );
 	  return NULL;
 	}
 
@@ -1772,14 +1772,14 @@
 
   if (data == NULL || sscanf (data, "%d", &tmp) < 1)
     {
-      message (" defresizeunit: one argument required ");
+      message (" defresizeunit:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
   if (tmp >= 0)
     defaults.frame_resize_unit = tmp;
   else
-    message (" defresizeunit: invalid argument ");
+    message (" defresizeunit:" MESSAGE_INVALID_ARGUMENT );
 
   return NULL;
 }
@@ -2053,7 +2053,7 @@
 		     
   if (data == NULL)
     {
-      message (" rudeness: one argument required ");
+      message (" rudeness:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2141,7 +2141,7 @@
 
   if (data == NULL)
     {
-      message (" gravity: one argument required ");
+      message (" gravity:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2166,7 +2166,7 @@
 
   if (data == NULL)
     {
-      message (" defwingravity: one argument required ");
+      message (" defwingravity:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2188,7 +2188,7 @@
  
   if (data == NULL)
     {
-      message (" deftransgravity: one argument required ");
+      message (" deftransgravity:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2210,7 +2210,7 @@
 
   if (data == NULL)
     {
-      message (" defmaxsizegravity: one argument required ");
+      message (" defmaxsizegravity:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2232,12 +2232,12 @@
     
   if (data == NULL)
     {
-      message (" msgwait: one argument required ");
+      message (" msgwait:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
   if (sscanf (data, "%d", &tmp) < 1 || tmp < 0)
-    message (" msgwait: invalid argument ");    
+    message (" msgwait:" MESSAGE_INVALID_ARGUMENT );    
   else
     defaults.bar_timeout = tmp;
 
@@ -2254,7 +2254,7 @@
 
   if (data == NULL)
     {
-      message (" defbargravity: one argument required ");
+      message (" defbargravity:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2334,7 +2334,7 @@
   if (data == NULL
       || sscanf (data, "%d %d %d %d", &l, &t, &r, &b) < 4)
     {
-      message (" defpadding: four arguments required ");
+      message (" defpadding:" MESSAGE_FOUR_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -2392,13 +2392,13 @@
 
   if (data == NULL)
     {
-      message (" defborder: one argument required ");
+      message (" defborder:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
   if (sscanf (data, "%d", &tmp) < 1 || tmp < 0)
     {
-      message (" defborder: invalid argument ");
+      message (" defborder:" MESSAGE_INVALID_ARGUMENT );
       return NULL;
     }
 
@@ -2425,13 +2425,13 @@
 
   if (data == NULL)
     {
-      message (" defbarborder: one argument required ");
+      message (" defbarborder:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
   if (sscanf (data, "%d", &tmp) < 1 || tmp < 0)
     {
-      message (" defbarborder: invalid argument ");
+      message (" defbarborder:" MESSAGE_INVALID_ARGUMENT );
       return NULL;
     }
 
@@ -2458,12 +2458,12 @@
 
   if (data == NULL)
     {
-      message (" definputwidth: one argument required ");
+      message (" definputwidth:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
   if (sscanf (data, "%d", &tmp) < 1 || tmp < 0)
-    message (" definputwidth: invalid argument ");
+    message (" definputwidth:" MESSAGE_INVALID_ARGUMENT );
   else
     defaults.input_window_size = tmp;
 
@@ -2479,7 +2479,7 @@
   if (data == NULL
       || sscanf (data, "%d", &defaults.wait_for_key_cursor) < 1)
     {
-      message (" defwaitcursor: one argument required ");
+      message (" defwaitcursor:" MESSAGE_ONE_ARGUMENT_REQUIRED );
     }
 
   return NULL;    
@@ -2521,7 +2521,7 @@
 
   if (data == NULL)
     {
-      message (" defwinname: one argument required ");
+      message (" defwinname:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2536,7 +2536,7 @@
   else if (!strncmp (name, "class", 5))
     defaults.win_name = WIN_NAME_RES_CLASS;
   else
-    message (" defwinname: invalid argument ");
+    message (" defwinname:" MESSAGE_INVALID_ARGUMENT );
 
   return NULL;      
 }
@@ -2549,7 +2549,7 @@
 
   if (data == NULL)
     {
-      message (" deffgcolor: one argument required ");
+      message (" deffgcolor:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2580,7 +2580,7 @@
 
   if (data == NULL)
     {
-      message (" defbgcolor: one argument required ");
+      message (" defbgcolor:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2611,7 +2611,7 @@
 
   if (data == NULL)
     {
-      message (" setenv: two arguments required ");
+      message (" setenv:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -2623,7 +2623,7 @@
   token = strtok (dup, " ");
   if (token == NULL)
     {
-      message (" setenv: two arguments required ");
+      message (" setenv:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       free (dup);
       sbuf_free (env);
       return NULL;
@@ -2634,7 +2634,7 @@
   token = strtok (NULL, "\0");
   if (token == NULL)
     {
-      message (" setenv: two arguments required ");
+      message (" setenv:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       free (dup);
       sbuf_free (env);
       return NULL;
@@ -2667,7 +2667,7 @@
 
   if (data == NULL)
     {
-      message (" getenv: one argument required ");
+      message (" getenv:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2675,7 +2675,7 @@
   var = xmalloc (strlen (data) + 1);
   if (sscanf (data, "%s", var) < 1)
     {
-      message (" getenv: one argument required ");
+      message (" getenv:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       free (var);
       return NULL;
     }
@@ -2828,7 +2828,7 @@
 
   if (data == NULL)
     {
-      message (" startup_message: one argument required ");
+      message (" startup_message:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -2837,7 +2837,7 @@
   else if (!strcasecmp (data, "off"))
     defaults.startup_message = 0;
   else
-    message (" startup_message: invalid argument ");
+    message (" startup_message:" MESSAGE_INVALID_ARGUMENT );
 
   return NULL;
 }
@@ -2883,7 +2883,7 @@
   if (data == NULL
       || sscanf (data, "%d %d", &x, &y) < 2) 
     {
-      message (" defbarpadding: two arguments required ");
+      message (" defbarpadding:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -2894,7 +2894,7 @@
     }
   else
     {
-      message (" defbarpadding: invalid argument ");    
+      message (" defbarpadding:" MESSAGE_INVALID_ARGUMENT );    
     }
   return NULL;
 }
@@ -2906,7 +2906,7 @@
   
   if (data == NULL)
     {
-      message (" alias: two arguments required ");
+      message (" alias:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -2916,7 +2916,7 @@
 
   if (name == NULL || alias == NULL)
     {
-      message (" alias: two arguments required ");
+      message (" alias:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -2934,7 +2934,7 @@
   
   if (data == NULL)
     {
-      message (" unalias: one argument required ");
+      message (" unalias:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -3021,7 +3021,7 @@
 
   if (data == NULL)
     {
-      message (" warp: one argument required ");
+      message (" warp:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -3030,7 +3030,7 @@
   else if (!strcasecmp (data, "off"))
     defaults.warp = 0;
   else
-    message (" warp: invalid argument ");
+    message (" warp:" MESSAGE_INVALID_ARGUMENT );
  
   return NULL;
 }
@@ -3201,7 +3201,7 @@
 
   if (data == NULL)
     {
-      message (" tmpwm: one argument required ");
+      message (" tmpwm:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -3407,7 +3407,7 @@
 
   if (data == NULL)
     {
-      message (" frestore: one argument required ");
+      message (" frestore:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -3510,7 +3510,7 @@
 
   if (data == NULL)
     {
-      message (" defwinliststyle: one argument required ");
+      message (" defwinliststyle:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
      }
 
@@ -3524,7 +3524,7 @@
     }
   else
     {
-      message (" defwinliststyle: invalid argument ");
+      message (" defwinliststyle:" MESSAGE_INVALID_ARGUMENT );
     }
 
    return NULL;    
@@ -3727,7 +3727,7 @@
   g = find_group (str);
   if (g == NULL)
     {
-      message (" gmove: cannot find group ");
+      message (" gmove:" MESSAGE_CANNOT_FIND_GROUP );
       return NULL;
     }
 
@@ -3742,7 +3742,7 @@
 
   if (data == NULL)
     {
-      message (" gmerge: one argument required ");
+      message (" gmerge:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -3751,7 +3751,7 @@
   if (g)
     groups_merge (g, rp_current_group);
   else
-    message (" gmerge: cannot find group ");
+    message (" gmerge:" MESSAGE_CANNOT_FIND_GROUP );
 
   return NULL;
 }
@@ -3766,7 +3766,7 @@
 
   if (data == NULL)
     {
-      message (" addhook: two arguments required ");
+      message (" addhook:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -3785,7 +3785,7 @@
   
   if (token == NULL)
     {
-      message (" addhook: two arguments required ");
+      message (" addhook:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       free (dup);
       return NULL;
     }
@@ -3809,7 +3809,7 @@
 
   if (data == NULL)
     {
-      message (" remhook: two arguments required ");
+      message (" remhook:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       return NULL;
     }
 
@@ -3828,7 +3828,7 @@
   
   if (token == NULL)
     {
-      message (" remhook: two arguments required ");
+      message (" remhook:" MESSAGE_TWO_ARGUMENTS_REQUIRED );
       free (dup);
       return NULL;
     }
@@ -3931,7 +3931,7 @@
       g = find_group (data);
       if (!g)
 	{
-	  message (" gdelete: cannot find group ");
+	  message (" gdelete:" MESSAGE_CANNOT_FIND_GROUP );
 	  return NULL;
 	}
     }
@@ -4030,7 +4030,7 @@
 
   if (data == NULL)
     {
-      message (" newkmap: one argument required ");
+      message (" newkmap:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }
 
@@ -4054,7 +4054,7 @@
 
   if (data == NULL)
     {
-      message (" delkmap: one argument required ");
+      message (" delkmap:" MESSAGE_ONE_ARGUMENT_REQUIRED );
       return NULL;
     }