Index: src/delete.c
===================================================================
RCS file: /cvs/gnome/metacity/src/delete.c,v
retrieving revision 1.16
diff -u -r1.16 delete.c
--- src/delete.c	1 Oct 2006 22:30:01 -0000	1.16
+++ src/delete.c	28 Oct 2006 11:40:50 -0000
@@ -64,14 +64,14 @@
 
   if (end == NULL || end == str)
     {
-      meta_warning (_("Could not parse \"%s\" as an integer"),
+      meta_warning ("Could not parse \"%s\" as an integer",
                     str);
       return None;
     }
 
   if (*end != '\0')
     {
-      meta_warning (_("Did not understand trailing characters \"%s\" in string \"%s\""),
+      meta_warning ("Did not understand trailing characters \"%s\" in string \"%s\"",
                     end, str);
       return None;
     }
@@ -91,14 +91,14 @@
 
   if (end == NULL || end == str)
     {
-      meta_warning (_("Could not parse \"%s\" as an integer"),
+      meta_warning ("Could not parse \"%s\" as an integer",
                     str);
       return None;
     }
 
   if (*end != '\0')
     {
-      meta_warning (_("Did not understand trailing characters \"%s\" in string \"%s\""),
+      meta_warning ("Did not understand trailing characters \"%s\" in string \"%s\"",
                     end, str);
       return None;
     }
@@ -129,7 +129,7 @@
   else
     {
       g_strfreev (split);
-      meta_warning (_("Failed to parse message \"%s\" from dialog process\n"),
+      meta_warning ("Failed to parse message \"%s\" from dialog process\n",
                     str);
       return FALSE;
     }
@@ -264,7 +264,7 @@
       
       if (err)
         {
-          meta_warning (_("Error reading from dialog display process: %s\n"),
+          meta_warning ("Error reading from dialog display process: %s\n",
                         err->message);
           g_error_free (err);
         }
@@ -345,7 +345,7 @@
                                  NULL,
                                  &err))
     {
-      meta_warning (_("Error launching metacity-dialog to ask about killing an application: %s\n"),
+      meta_warning ("Error launching metacity-dialog to ask about killing an application: %s\n",
                     err->message);
       g_error_free (err);
       goto out;
@@ -453,7 +453,7 @@
         }
       else
         {
-          meta_warning (_("Failed to get hostname: %s\n"),
+          meta_warning ("Failed to get hostname: %s\n",
                         strerror (errno));
         }
     }
Index: src/keybindings.c
===================================================================
RCS file: /cvs/gnome/metacity/src/keybindings.c,v
retrieving revision 1.137
diff -u -r1.137 keybindings.c
--- src/keybindings.c	13 Oct 2006 00:28:29 -0000	1.137
+++ src/keybindings.c	28 Oct 2006 11:40:54 -0000
@@ -1030,7 +1030,7 @@
           if (grab && result != Success)
             {      
               if (result == BadAccess)
-                meta_warning (_("Some other program is already using the key %s with modifiers %x as a binding\n"), keysym_name (keysym), modmask | ignored_mask);
+                meta_warning ("Some other program is already using the key %s with modifiers %x as a binding\n", keysym_name (keysym), modmask | ignored_mask);
               else
                 meta_topic (META_DEBUG_KEYBINDINGS,
                             "Failed to grab key %s with modifiers %x\n",
@@ -2662,7 +2662,7 @@
                                  NULL,
                                  &err))
     {
-      meta_warning (_("Error launching metacity-dialog to print an error about a command: %s\n"),
+      meta_warning ("Error launching metacity-dialog to print an error about a command: %s\n",
                     err->message);
       g_error_free (err);
     }
Index: src/prefs.c
===================================================================
RCS file: /cvs/gnome/metacity/src/prefs.c,v
retrieving revision 1.70
diff -u -r1.70 prefs.c
--- src/prefs.c	7 Oct 2006 16:56:47 -0000	1.70
+++ src/prefs.c	28 Oct 2006 11:40:56 -0000
@@ -573,7 +573,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_MOUSE_BUTTON_MODS);
           goto out;
         }
@@ -589,7 +589,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_FOCUS_MODE);
           goto out;
         }
@@ -605,7 +605,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_FOCUS_NEW_WINDOWS);
           goto out;
         }
@@ -621,7 +621,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_RAISE_ON_CLICK);
           goto out;
         }
@@ -637,7 +637,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_THEME);
           goto out;
         }
@@ -653,7 +653,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_TITLEBAR_FONT);
           goto out;
         }
@@ -669,7 +669,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_USE_SYSTEM_FONT);
           goto out;
         }
@@ -689,7 +689,7 @@
 
       if (value && value->type != GCONF_VALUE_INT)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_NUM_WORKSPACES);
           goto out;
         }
@@ -705,7 +705,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_APPLICATION_BASED);
           goto out;
         }
@@ -721,7 +721,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_APPLICATION_BASED);
           goto out;
         }
@@ -739,7 +739,7 @@
 
           if (value && value->type != GCONF_VALUE_LIST)
             {
-              meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+              meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                             key);
               goto out;
             }
@@ -755,7 +755,7 @@
 
           if (value && value->type != GCONF_VALUE_STRING)
             {
-              meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+              meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                             key);
               goto out;
             }
@@ -774,7 +774,7 @@
 
           if (value && value->type != GCONF_VALUE_LIST)
             {
-              meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+              meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                             key);
               goto out;
             }
@@ -790,7 +790,7 @@
 
           if (value && value->type != GCONF_VALUE_STRING)
             {
-               meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+               meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                             key);
                goto out;
             }
@@ -807,7 +807,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         key);
           goto out;
         }
@@ -823,7 +823,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_AUTO_RAISE);
           goto out;
         }
@@ -839,7 +839,7 @@
 
       if (value && value->type != GCONF_VALUE_INT)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_AUTO_RAISE_DELAY);
           goto out;
         }        
@@ -856,7 +856,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         key);
           goto out;
         }
@@ -872,7 +872,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_TERMINAL_COMMAND);
           goto out;
         }
@@ -888,7 +888,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         key);
           goto out;
         }
@@ -904,7 +904,7 @@
       
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_BUTTON_LAYOUT);
           goto out;
         }
@@ -920,7 +920,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         key);
           goto out;
         }
@@ -935,7 +935,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         key);
           goto out;
         }
@@ -950,7 +950,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_VISUAL_BELL_TYPE);
           goto out;
         }
@@ -965,7 +965,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                         KEY_REDUCED_RESOURCES);
           goto out;
         }
@@ -981,7 +981,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                        KEY_GNOME_ACCESSIBILITY);
           goto out;
         }
@@ -997,7 +997,7 @@
 
       if (value && value->type != GCONF_VALUE_STRING)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                        KEY_CURSOR_THEME);
           goto out;
         }
@@ -1013,7 +1013,7 @@
 
       if (value && value->type != GCONF_VALUE_INT)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                        KEY_CURSOR_SIZE);
           goto out;
         }
@@ -1029,7 +1029,7 @@
 
       if (value && value->type != GCONF_VALUE_BOOL)
         {
-          meta_warning (_("GConf key \"%s\" is set to an invalid type\n"),
+          meta_warning ("GConf key \"%s\" is set to an invalid type\n",
                        KEY_COMPOSITING_MANAGER);
           goto out;
         }
@@ -1074,7 +1074,7 @@
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Failed to parse new gconf value\n");
           
-          meta_warning (_("\"%s\" found in configuration database is not a valid value for mouse button modifier\n"),
+          meta_warning ("\"%s\" found in configuration database is not a valid value for mouse button modifier\n",
                         value);
         }
     }
@@ -1098,7 +1098,7 @@
       else if (g_ascii_strcasecmp (value, "mouse") == 0)
         focus_mode = META_FOCUS_MODE_MOUSE;
       else
-        meta_warning (_("GConf key '%s' is set to an invalid value\n"),
+        meta_warning ("GConf key '%s' is set to an invalid value\n",
                       KEY_FOCUS_MODE);
     }
 
@@ -1119,7 +1119,7 @@
       else if (g_ascii_strcasecmp (value, "strict") == 0)
         focus_new_windows = META_FOCUS_NEW_WINDOWS_STRICT;
       else
-        meta_warning (_("GConf key '%s' is set to an invalid value\n"),
+        meta_warning ("GConf key '%s' is set to an invalid value\n",
                       KEY_FOCUS_NEW_WINDOWS);
     }
 
@@ -1248,7 +1248,7 @@
   if (value >= 1 && value <= 128)
     cursor_size = value;
   else
-    meta_warning (_("%d stored in GConf key %s is not a reasonable cursor_size; must be in the range 1..128\n"),
+    meta_warning ("%d stored in GConf key %s is not a reasonable cursor_size; must be in the range 1..128\n",
                     value, KEY_CURSOR_SIZE);
 
   return old != value;
@@ -1328,7 +1328,7 @@
     {
       new_desc = pango_font_description_from_string (value);
       if (new_desc == NULL)
-        meta_warning (_("Could not parse font description \"%s\" from GConf key %s\n"),
+        meta_warning ("Could not parse font description \"%s\" from GConf key %s\n",
                       value, KEY_TITLEBAR_FONT);
     }
 
@@ -1555,7 +1555,7 @@
 
   if (value < 1 || value > MAX_REASONABLE_WORKSPACES)
     {
-      meta_warning (_("%d stored in GConf key %s is not a reasonable number of workspaces, current maximum is %d\n"),
+      meta_warning ("%d stored in GConf key %s is not a reasonable number of workspaces, current maximum is %d\n",
                     value, KEY_NUM_WORKSPACES, MAX_REASONABLE_WORKSPACES);
       if (value < 1)
         value = 1;
@@ -1615,7 +1615,7 @@
       {
         first_disable = FALSE;
 
-        meta_warning (_("Workarounds for broken applications disabled. Some applications may not behave properly.\n"));
+        meta_warning ("Workarounds for broken applications disabled. Some applications may not behave properly.\n");
       }
   }
   
@@ -1657,7 +1657,7 @@
       if (action_double_click_titlebar == META_ACTION_DOUBLE_CLICK_TITLEBAR_LAST)
         {
           action_double_click_titlebar = old_action;
-          meta_warning (_("GConf key '%s' is set to an invalid value\n"),
+          meta_warning ("GConf key '%s' is set to an invalid value\n",
                         KEY_ACTION_DOUBLE_CLICK_TITLEBAR);
         }
     }
@@ -1684,7 +1684,7 @@
 
   if (value < 0 || value > MAX_REASONABLE_AUTO_RAISE_DELAY)
     {
-      meta_warning (_("%d stored in GConf key %s is out of range 0 to %d\n"),
+      meta_warning ("%d stored in GConf key %s is out of range 0 to %d\n",
                     value, KEY_AUTO_RAISE_DELAY, 
 		    MAX_REASONABLE_AUTO_RAISE_DELAY);
       value = 0;
@@ -1827,7 +1827,7 @@
 
   if (err)
     {
-      meta_warning (_("Error setting number of workspaces to %d: %s\n"),
+      meta_warning ("Error setting number of workspaces to %d: %s\n",
                     num_workspaces,
                     err->message);
       g_error_free (err);
@@ -2213,7 +2213,7 @@
         {
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Failed to parse new gconf value\n");
-          meta_warning (_("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"),
+          meta_warning ("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n",
                         value, binding->name);
 
           return FALSE;
@@ -2383,7 +2383,7 @@
         {
           meta_topic (META_DEBUG_KEYBINDINGS,
                       "Failed to parse new gconf value\n");
-          meta_warning (_("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"),
+          meta_warning ("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n",
                         pref_string, binding->name);
 
           /* Should we remove this value from the list in gconf? */
@@ -2799,7 +2799,7 @@
   
   if (err)
     {
-      meta_warning (_("Error setting name for workspace %d to \"%s\": %s\n"),
+      meta_warning ("Error setting name for workspace %d to \"%s\": %s\n",
                     i, name ? name : "none",
                     err->message);
       g_error_free (err);
Index: src/screen.c
===================================================================
RCS file: /cvs/gnome/metacity/src/screen.c,v
retrieving revision 1.162
diff -u -r1.162 screen.c
--- src/screen.c	1 Oct 2006 22:30:02 -0000	1.162
+++ src/screen.c	28 Oct 2006 11:40:58 -0000
@@ -403,7 +403,7 @@
    */
   if (xroot == None)
     {
-      meta_warning (_("Screen %d on display '%s' is invalid\n"),
+      meta_warning ("Screen %d on display '%s' is invalid\n",
                     number, display->name);
       return NULL;
     }
@@ -419,7 +419,7 @@
       
       if (!replace_current_wm)
         {
-          meta_warning (_("Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"),
+          meta_warning ("Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n",
                         number, display->name);
 
           return NULL;
@@ -443,7 +443,7 @@
 
   if (XGetSelectionOwner (xdisplay, wm_sn_atom) != new_wm_sn_owner)
     {
-      meta_warning (_("Could not acquire window manager selection on screen %d display \"%s\"\n"),
+      meta_warning ("Could not acquire window manager selection on screen %d display \"%s\"\n",
                     number, display->name);
 
       XDestroyWindow (xdisplay, new_wm_sn_owner);
@@ -501,7 +501,7 @@
 		attr.your_event_mask);
   if (meta_error_trap_pop_with_return (display, FALSE) != Success)
     {
-      meta_warning (_("Screen %d on display \"%s\" already has a window manager\n"),
+      meta_warning ("Screen %d on display \"%s\" already has a window manager\n",
                     number, display->name);
 
       XDestroyWindow (xdisplay, new_wm_sn_owner);
@@ -706,7 +706,7 @@
   meta_error_trap_push_with_return (screen->display);
   XSelectInput (screen->display->xdisplay, screen->xroot, 0);
   if (meta_error_trap_pop_with_return (screen->display, FALSE) != Success)
-    meta_warning (_("Could not release screen %d on display \"%s\"\n"),
+    meta_warning ("Could not release screen %d on display \"%s\"\n",
                   screen->number, screen->display->name);
 
   XDestroyWindow (screen->display->xdisplay,
Index: src/session.c
===================================================================
RCS file: /cvs/gnome/metacity/src/session.c,v
retrieving revision 1.43
diff -u -r1.43 session.c
--- src/session.c	1 Oct 2006 22:30:02 -0000	1.43
+++ src/session.c	28 Oct 2006 11:41:00 -0000
@@ -834,14 +834,14 @@
   if (mkdir (metacity_dir, 0700) < 0 &&
       errno != EEXIST)
     {
-      meta_warning (_("Could not create directory '%s': %s\n"),
+      meta_warning ("Could not create directory '%s': %s\n",
                     metacity_dir, g_strerror (errno));
     }
 
   if (mkdir (session_dir, 0700) < 0 &&
       errno != EEXIST)
     {
-      meta_warning (_("Could not create directory '%s': %s\n"),
+      meta_warning ("Could not create directory '%s': %s\n",
                     session_dir, g_strerror (errno));
     }
 
@@ -851,7 +851,7 @@
 
   if (outfile == NULL)
     {
-      meta_warning (_("Could not open session file '%s' for writing: %s\n"),
+      meta_warning ("Could not open session file '%s' for writing: %s\n",
                     full_save_file (), g_strerror (errno));
       goto out;
     }
@@ -1003,12 +1003,12 @@
       /* FIXME need a dialog for this */
       if (ferror (outfile))
         {
-          meta_warning (_("Error writing session file '%s': %s\n"),
+          meta_warning ("Error writing session file '%s': %s\n",
                         full_save_file (), g_strerror (errno));
         }
       if (fclose (outfile))
         {
-          meta_warning (_("Error closing session file '%s': %s\n"),
+          meta_warning ("Error closing session file '%s': %s\n",
                         full_save_file (), g_strerror (errno));
         }
     }
@@ -1083,7 +1083,7 @@
                             &length,
                             &error))
     {
-      meta_warning (_("Failed to read saved session file %s: %s\n"),
+      meta_warning ("Failed to read saved session file %s: %s\n",
                     session_file, error->message);
       g_error_free (error);
       g_free (session_file);
@@ -1118,7 +1118,7 @@
 
  error:
   
-  meta_warning (_("Failed to parse saved session file: %s\n"),
+  meta_warning ("Failed to parse saved session file: %s\n",
                 error->message);
   g_error_free (error);
 
@@ -1905,7 +1905,7 @@
                                  NULL,
                                  &err))
     {
-      meta_warning (_("Error launching metacity-dialog to warn about apps that don't support session management: %s\n"),
+      meta_warning ("Error launching metacity-dialog to warn about apps that don't support session management: %s\n",
                     err->message);
       g_error_free (err);
     }
Index: src/theme.c
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.c,v
retrieving revision 1.82
diff -u -r1.82 theme.c
--- src/theme.c	7 Oct 2006 16:56:47 -0000	1.82
+++ src/theme.c	28 Oct 2006 11:41:05 -0000
@@ -2449,7 +2449,7 @@
                                        &retval, NULL,
                                        &error))
     {
-      meta_warning (_("Theme contained an expression \"%s\" that resulted in an error: %s\n"),
+      meta_warning ("Theme contained an expression \"%s\" that resulted in an error: %s\n",
                     expr, error->message);
 
       g_error_free (error);
@@ -2471,7 +2471,7 @@
                                        NULL, &retval,
                                        &error))
     {
-      meta_warning (_("Theme contained an expression \"%s\" that resulted in an error: %s\n"),
+      meta_warning ("Theme contained an expression \"%s\" that resulted in an error: %s\n",
                     expr, error->message);
 
       g_error_free (error);
@@ -2492,7 +2492,7 @@
   if (!meta_parse_size_expression (expr, env,
                                    &retval, &error))
     {
-      meta_warning (_("Theme contained an expression \"%s\" that resulted in an error: %s\n"),
+      meta_warning ("Theme contained an expression \"%s\" that resulted in an error: %s\n",
                     expr, error->message);
 
       g_error_free (error);
@@ -4494,7 +4494,7 @@
 
   if (new_theme == NULL)
     {
-      meta_warning (_("Failed to load theme \"%s\": %s\n"),
+      meta_warning ("Failed to load theme \"%s\": %s\n",
                     name, err->message);
       g_error_free (err);
     }
Index: src/util.c
===================================================================
RCS file: /cvs/gnome/metacity/src/util.c,v
retrieving revision 1.41
diff -u -r1.41 util.c
--- src/util.c	1 Oct 2006 22:30:10 -0000	1.41
+++ src/util.c	28 Oct 2006 11:41:05 -0000
@@ -95,7 +95,7 @@
       
       if (err != NULL)
         {
-          meta_warning (_("Failed to open debug log: %s\n"),
+          meta_warning ("Failed to open debug log: %s\n",
                         err->message);
           g_error_free (err);
           return;
@@ -105,8 +105,8 @@
       
       if (logfile == NULL)
         {
-          meta_warning (_("Failed to fdopen() log file %s: %s\n"),
-                        filename, strerror (errno));
+          meta_warning ("Failed to fdopen() log file %s: %s\n"),
+                        filename, strerror (errno);
           close (fd);
         }
       else
@@ -396,7 +396,7 @@
   out = logfile ? logfile : stderr;
   
   if (no_prefix == 0)
-    utf8_fputs (_("Window manager warning: "), out);
+    utf8_fputs ("Window manager warning: ", out);
   utf8_fputs (str, out);
 
   fflush (out);
Index: src/window-props.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window-props.c,v
retrieving revision 1.33
diff -u -r1.33 window-props.c
--- src/window-props.c	1 Oct 2006 22:30:10 -0000	1.33
+++ src/window-props.c	28 Oct 2006 11:41:06 -0000
@@ -169,7 +169,7 @@
       gulong cardinal = (int) value->v.cardinal;
       
       if (cardinal <= 0)
-        meta_warning (_("Application set a bogus _NET_WM_PID %lu\n"),
+        meta_warning ("Application set a bogus _NET_WM_PID %lu\n",
                       cardinal);
       else
         {
@@ -1183,8 +1183,8 @@
       meta_display_lookup_x_window (window->display, 
                                     window->xtransient_for) == NULL)
     {
-      meta_warning (_("Invalid WM_TRANSIENT_FOR window 0x%lx specified "
-                      "for %s.\n"),
+      meta_warning ("Invalid WM_TRANSIENT_FOR window 0x%lx specified "
+                      "for %s.\n",
                     window->xtransient_for, window->desc);
       window->xtransient_for = None;
     }
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.456
diff -u -r1.456 window.c
--- src/window.c	13 Oct 2006 00:28:30 -0000	1.456
+++ src/window.c	28 Oct 2006 11:41:14 -0000
@@ -5386,7 +5386,7 @@
                                            &str))
             {
               if (window->sm_client_id == NULL) /* first time through */
-                meta_warning (_("Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"),
+                meta_warning ("Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n",
                               window->desc);
               
               window->sm_client_id = g_strdup (str);
@@ -5982,7 +5982,7 @@
        * about these apps but make them work.
        */
       
-      meta_warning (_("Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"),
+      meta_warning ("Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n",
                     window->desc,
                     window->size_hints.min_width,
                     window->size_hints.min_height,
Index: src/xprops.c
===================================================================
RCS file: /cvs/gnome/metacity/src/xprops.c,v
retrieving revision 1.25
diff -u -r1.25 xprops.c
--- src/xprops.c	1 Oct 2006 22:30:10 -0000	1.25
+++ src/xprops.c	28 Oct 2006 11:41:15 -0000
@@ -152,7 +152,7 @@
   if (res_name == NULL)
     res_name = "unknown";
   
-  meta_warning (_("Window 0x%lx has property %s\nthat was expected to have type %s format %d\nand actually has type %s format %d n_items %d.\nThis is most likely an application bug, not a window manager bug.\nThe window has title=\"%s\" class=\"%s\" name=\"%s\"\n"),
+  meta_warning ("Window 0x%lx has property %s\nthat was expected to have type %s format %d\nand actually has type %s format %d n_items %d.\nThis is most likely an application bug, not a window manager bug.\nThe window has title=\"%s\" class=\"%s\" name=\"%s\"\n",
                 results->xwindow,
                 prop_name ? prop_name : "(bad atom)",
                 expected_name ? expected_name : "(bad atom)",
@@ -398,7 +398,7 @@
       char *name;
 
       name = XGetAtomName (results->display->xdisplay, results->xatom);
-      meta_warning (_("Property %s on window 0x%lx contained invalid UTF-8\n"),
+      meta_warning ("Property %s on window 0x%lx contained invalid UTF-8\n",
                     name, results->xwindow);
       meta_XFree (name);
       XFree (results->prop);
@@ -481,7 +481,7 @@
           meta_error_trap_push (results->display);
           name = XGetAtomName (results->display->xdisplay, results->xatom);
           meta_error_trap_pop (results->display, TRUE);
-          meta_warning (_("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"),
+          meta_warning ("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n",
                         name, results->xwindow, i);
           meta_XFree (name);
           meta_XFree (results->prop);
