? metacity-gora_mohanty-readable_strings.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/metacity/ChangeLog,v
retrieving revision 1.1206
diff -r1.1206 ChangeLog
0a1,7
> 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
> 
Index: src/metacity.schemas.in
===================================================================
RCS file: /cvs/gnome/metacity/src/metacity.schemas.in,v
retrieving revision 1.49
diff -r1.49 metacity.schemas.in
79,88c79,87
<            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
> 	   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.
120,132c119,123
<           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.
193,199c184,186
<           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.
214,215c201
<           has a fixed maximum (to prevent accidentally destroying 
<           your desktop by asking for 34 million workspaces).
---
>           has a fixed maximum.
230c216
< 	in noisy environments, or when 'audible bell' is off.
---
> 	in noisy environments.
323,330c309,316
<            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, 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.
977,980c963,966
<             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 window, it raises the
>             window above all others, and if it is already fully visible, it
>             lowers the window below all others.
1952,1970c1938,1942
<           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.
Index: src/theme.c
===================================================================
RCS file: /cvs/gnome/metacity/src/theme.c,v
retrieving revision 1.76
diff -r1.76 theme.c
1978c1978
<                        _("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."));
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.427
diff -r1.427 window.c
5198c5198
<                 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 the SM_CLIENT_ID property on itself, instead of on the client leader window as specified in the ICCCM.\n"),
