? metacity-gora_mohanty-readable_strings.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/metacity/ChangeLog,v
retrieving revision 1.1218
diff -u -r1.1218 ChangeLog
--- ChangeLog	31 Mar 2006 17:25:01 -0000	1.1218
+++ ChangeLog	31 Mar 2006 19:03:59 -0000
@@ -1,3 +1,12 @@
+<<<<<<< ChangeLog
+2006-03-27  Gora Mohanty  <gmohanty@cvs.gnome.org>
+
+        * src/metacity.schemas.in src/theme.c, src/window.c: Changes
+        strings to make them more readable, and more translatable.
+
+        See #335720
+
+=======
 Fri Mar 31 12:24:26 2006  Søren Sandmann  <sandmann@redhat.com>
 
 	* src/c-screen.c (meta_screen_info_redirect): Only use magnifier
@@ -78,6 +87,7 @@
 	* src/c-screen.c (meta_screen_info_redirect): Trap errors out of
 	unredirect(). 
 
+>>>>>>> 1.1218
 2006-03-25  Thomas Thurman  <thomas@thurman.org.uk>
 
 	* src/window.c, src/window.h (update_net_wm_state,
Index: src/metacity.schemas.in
===================================================================
RCS file: /cvs/gnome/metacity/src/metacity.schemas.in,v
retrieving revision 1.49
diff -u -r1.49 metacity.schemas.in
--- src/metacity.schemas.in	25 Mar 2006 07:21:27 -0000	1.49
+++ src/metacity.schemas.in	31 Mar 2006 19:04:02 -0000
@@ -76,16 +76,14 @@
          <short>Whether raising should be a side-effect of other user
                 interactions</short>
          <long>
-           Many actions (e.g. clicking in the client area, moving or
-           resizing the window) normally raise the window as a side-effect.
-           Set this option to false to decouple raising from other user
-           interactions.  When false, windows can still be raised by an
-           alt-left-click anywhere on the window or a normal click on the
-           window decorations (assuming such clicks aren't used to start a
-           move or resize operation).  Special messages, such as activation
-           requests from pagers, may also raise windows when this option is
-           false.  This option is currently disabled in click-to-focus
-           mode.
+	   Many actions (e.g. clicking in the client area, moving or resizing
+	   the window) normally raise the window as a side-effect. Set this
+	   option to false to decouple raising from other user actions.
+	   Even when this option is false, windows can still be raised by an
+           alt-left-click anywhere on the window, a normal click on the window
+           decorations, or by special messages, such as activation requests
+	   from pagers. This option is currently disabled in click-to-focus
+           mode. 
          </long>
       </locale>
     </schema>
@@ -117,19 +115,11 @@
       <locale name="C">
          <short>Automatically raises the focused window</short>
          <long>
-          If true, and the focus mode is either "sloppy" or "mouse"
-	  then the focused window will be automatically raised after a 
-	  delay (the delay is specified by the auto_raise_delay key).
-
-          This preference is poorly named, but kept for backwards
-          compatibility.  To try to be more clear (at least to the
-          technically inclined), its meaning is "automatically raise
-          the window following a timeout which is triggered by
-          non-grabbed mouse entry in sloppy or mouse focus modes".  It
-          is unrelated to clicking behavior (i.e. this is not related
-          to raise-on-click/orthogonal-raise).  It is unrelated to
-          entering a window during drag and drop (because that results
-          in the application grabbing the mouse)
+          If set to true, and the focus mode is either "sloppy" or "mouse"
+	  then the focused window will be automatically raised after a delay
+	  specified by the auto_raise_delay key. This is not related to
+	  clicking on a window to raise it, nor to entering a window during
+	  drag-and-drop.
          </long>
       </locale>
     </schema>
@@ -190,13 +180,9 @@
          <short>Window title font</short>
          <long>
           A font description string describing a font for window
-          titlebars. The size from the description
-          will only be used if the titlebar_font_size option is set 
-          to 0, however. Also, this option is disabled if the
-          titlebar_uses_desktop_font option is set to true.
-          By default, titlebar_font is unset, causing Metacity to fall 
-          back to the desktop font even if titlebar_uses_desktop_font 
-          is false.
+	  titlebars. The size from the description will only be used if the
+	  titlebar_font_size option is set to 0. Also, this option is disabled
+	  if the titlebar_uses_desktop_font option is set to true.
          </long>
       </locale>
     </schema>
@@ -210,9 +196,9 @@
       <locale name="C">
          <short>Number of workspaces</short>
          <long>
-          Number of workspaces. Must be more than zero, and 
-          has a fixed maximum (to prevent accidentally destroying 
-          your desktop by asking for 34 million workspaces).
+          Number of workspaces. Must be more than zero, and has a fixed
+	  maximum to prevent making the desktop unusable by accidentally
+	  asking for too many workspaces.
          </long>
       </locale>
     </schema>
@@ -227,7 +213,7 @@
          <short>Enable Visual Bell</short>
          <long>Turns on a visual indication when an application or the system
 	issues a 'bell' or 'beep'; useful for the hard-of-hearing and for use
-	in noisy environments, or when 'audible bell' is off.
+	in noisy environments.
          </long>
       </locale>
     </schema>
@@ -320,14 +306,11 @@
       <locale name="C">
          <short>If true, trade off usability for less resource usage</short>
          <long>
-           If true, metacity will give the user less feedback and less
-           sense of "direct manipulation", by using wireframes,
-           avoiding animations, or other means. This is a significant
-           reduction in usability for many users, but may allow legacy
-           applications and terminal servers to function when they
-           would otherwise be impractical. However, the wireframe
-           feature is disabled when accessibility is on to avoid weird
-           desktop breakages.
+	   If true, metacity will give the user less feedback by using
+	   wireframes, avoiding animations, or other means. This is a
+           significant reduction in usability for many users, but may allow
+           legacy applications to continue working. However, the wireframe
+           feature is disabled when accessibility is on.
          </long>
       </locale>
     </schema>
@@ -974,10 +957,10 @@
       <locale name="C">
          <short>Raise obscured window, otherwise lower</short>
          <long>
-            This keybinding changes whether a window is above or below
-            other windows. If the window is covered by another window, it raises
-            the window above other windows. If the window is already fully visible, 
-            it lowers the window below other windows.
+            This keybinding changes whether a window is above or below other
+            windows. If the window is covered by another one, it raises it
+            above all others, and if it is already fully visible, it
+            lowers it below all others.
 
             The format looks like "&lt;Control&gt;a" or
             "&lt;Shift&gt;&lt;Alt&gt;F1".
@@ -1921,20 +1904,15 @@
       <default>false</default>
       <locale name="C">
          <short>(Not implemented) Navigation works in terms of applications not windows</short>
-         <long> 
-         If true, then Metacity works in terms of applications rather 
-         than windows. The concept is a bit abstract, but 
-         in general an application-based setup is more like  
-         the Mac and less like Windows. When you focus a window 
-         in application-based mode, all the windows in the 
-         application will be raised. Also, in application-based 
-         mode, focus clicks are not passed through to windows 
-         in other applications. 
-         The existence of this setting is somewhat questionable. 
-         But it's better than having settings for all the specific 
-         details of application-based vs. window-based, e.g. 
-         whether to pass through clicks. Also, application-based mode
-         is largely unimplemented at the moment.
+         <long>
+         If true, then Metacity works in terms of applications rather than
+         windows. The concept is a bit abstract, but in general an
+         application-based setup is more like the Mac and less like
+         Windows. When you focus a window in application-based mode, all the
+         windows in the application will be raised. Also, in
+         application-based mode, focus clicks are not passed through to
+         windows in other applications. Application-based mode is, however,
+         largely unimplemented at the moment.
          </long>
       </locale>
     </schema>
@@ -1949,25 +1927,11 @@
          <short>Disable misfeatures that are required by old or broken
                 applications</short>
          <long> 
-          Some applications break specifications in ways that result
-          in window manager misfeatures. For example, ideally Metacity
-          would place all dialogs in a consistent position with
-          respect to their parent window. This requires ignoring
-          application-specified positions for dialogs. But some
-          versions of Java/Swing mark their popup menus as dialogs, 
-          so Metacity has to disable dialog positioning to allow 
-          menus to work in broken Java applications. There are 
-          several other examples like this.
-
-          This option puts Metacity in full-on Correct mode, which
-          perhaps gives a moderately nicer UI if you don't need to run
-          any broken apps. Sadly, workarounds must be enabled by
-          default; the real world is an ugly place.
-
-          Some of the workarounds are workarounds for limitations in 
-          the specifications themselves, so sometimes a bug 
-          in no-workarounds mode won't be fixable without 
-          amending a spec.
+	  Some applications disregard specifications in ways that result in
+	  window manager misfeatures. This option puts Metacity in a
+	  rigorously correct mode, which gives a more consistent user
+	  interface, provided one does not need to run any misbehaving
+	  applications.
          </long>
 
       </locale>
Index: src/theme.c
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.c,v
retrieving revision 1.76
diff -u -r1.76 theme.c
--- src/theme.c	21 Jan 2006 21:26:55 -0000	1.76
+++ src/theme.c	31 Mar 2006 19:04:09 -0000
@@ -1975,7 +1975,7 @@
         {
           g_set_error (err, META_THEME_ERROR,
                        META_THEME_ERROR_FAILED,
-                       _("Coordinate expression parser overflowed its buffer, this is really a Metacity bug, but are you sure you need a huge expression like that?"));
+                       _("Coordinate expression parser overflowed its buffer."));
           return FALSE;
         }
 
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.430
diff -u -r1.430 window.c
--- src/window.c	30 Mar 2006 19:22:38 -0000	1.430
+++ src/window.c	31 Mar 2006 19:04:19 -0000
@@ -5201,7 +5201,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 client leader window as specified in the ICCCM.\n"),
                               window->desc);
               
               window->sm_client_id = g_strdup (str);
