Index: gnome-panel/panel-general.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-general.schemas.in,v
retrieving revision 1.5
diff -u -r1.5 panel-general.schemas.in
--- gnome-panel/panel-general.schemas.in	21 May 2003 10:05:03 -0000	1.5
+++ gnome-panel/panel-general.schemas.in	22 May 2003 18:27:39 -0000
@@ -9,12 +9,12 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-        <short>Enable the program list in the "Run Application" dialog.</short>
+        <short>Enable program list in "Run Application" dialog.</short>
         <long>
           If true the "Known Applications" listing in the "Run
           Program" dialog is made available. Whether or not the
           listing is expanded when the dialog is shown is controlled
-          by the show_program_list setting.
+          by the show_program_list key.
         </long>
       </locale>
     </schema>
@@ -29,7 +29,8 @@
         <long>
           If true the "Known Applications" listing in the "Run
           Program" is expanded when the dialog is opened. This
-          setting is only relevant if enable_program_list is true.
+          key is only relevant if the enable_program_list key
+	  is true.
         </long>
       </locale>
     </schema>
@@ -41,10 +42,10 @@
       <list_type>string</list_type>
       <default>[]</default>
       <locale name="C">
-        <short>A list of panel IDs</short>
+        <short>List of panel IDs</short>
         <long>
           A list of panel IDs. Each ID identifies an individual
-          toplevel panel. The settings for each of these panels is
+          toplevel panel. The ID for each of these panels is
           stored in /apps/panel/general/$(profile)/toplevels/$(id).
         </long>
       </locale>
@@ -57,10 +58,10 @@
       <type>list</type>
       <default>[]</default>
       <locale name="C">
-        <short>A list of panel applet IDs</short>
+        <short>List of panel applet IDs</short>
         <long>
           A list of panel applet IDs. Each ID identifies an
-          individual panel applet. The settings for each of these
+          individual panel applet. The ID for each of these
           applets is stored in
           /apps/panel/general/$(profiles)/applets/$(id).
         </long>
@@ -74,11 +75,11 @@
       <list_type>string</list_type>
       <default>[]</default>
       <locale name="C">
-        <short>A list of panel object IDs</short>
+        <short>List of panel object IDs</short>
         <long>
           A list of panel object IDs. Each ID identifies an individual
           panel object (e.g. a launcher, action button or menu
-          button/bar). The settings for each of these objects is
+          button/bar). The ID for each of these objects is
           stored in
           /apps/panel/general/$(profiles)/objects/$(id).
         </long>
Index: gnome-panel/panel-global.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-global.schemas.in,v
retrieving revision 1.20
diff -u -r1.20 panel-global.schemas.in
--- gnome-panel/panel-global.schemas.in	7 Dec 2002 21:18:46 -0000	1.20
+++ gnome-panel/panel-global.schemas.in	22 May 2003 18:27:39 -0000
@@ -134,7 +134,7 @@
         <type>string</type>
         <default>Print</default>
         <locale name="C">
-          <short>Take a screen shot</short>
+          <short>Take a screenshot</short>
           <long></long>
         </locale>
       </schema>
@@ -146,7 +146,7 @@
         <type>string</type>
         <default>&lt;Alt&gt;Print</default>
         <locale name="C">
-          <short>Take a screen shot of a window</short>
+          <short>Take a screenshot of a window</short>
           <long></long>
         </locale>
       </schema>
Index: gnome-panel/panel-object.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-object.schemas.in,v
retrieving revision 1.2
diff -u -r1.2 panel-object.schemas.in
--- gnome-panel/panel-object.schemas.in	5 Mar 2003 01:11:34 -0000	1.2
+++ gnome-panel/panel-object.schemas.in	22 May 2003 18:27:39 -0000
@@ -13,8 +13,8 @@
       <locale name="C">
         <short>The type of panel object</short>
         <long>
-          The type of this panel object. There are several possible
-          values - "drawer-object", "menu-object", "launcher-object",
+          The type of this panel object. Possible values are
+	  "drawer-object", "menu-object", "launcher-object",
           "bonobo-applet", "action-applet" and "menu-bar".
         </long>
       </locale>
@@ -26,9 +26,9 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-        <short>The panel toplevel which contains this object</short>
+        <short>The toplevel panel which contains this object</short>
         <long>
-          The identifier of the panel toplevel which contains this object.
+          The identifier of the toplevel panel which contains this object.
         </long>
       </locale>
     </schema>
@@ -73,8 +73,8 @@
         <short>The Bonobo IID of the applet</short>
         <long>
           The Bonobo implementation ID of the applet - e.g.
-          "OAFIID:GNOME_ClockApplet". This setting is only relevant if
-          the object_type is "bonobo-applet".
+          "OAFIID:GNOME_ClockApplet". This key is only
+	  relevant if the object_type key is "bonobo-applet".
         </long>
       </locale>
     </schema>
@@ -90,8 +90,7 @@
         <short>The panel attached to this drawer</short>
         <long>
           The identifier of the panel attached to this drawer. This
-          setting is only relevant if the object_type is
-          "drawer-object".
+          key is only relevant if the object_type key is "drawer-object".
         </long>
       </locale>
     </schema>
@@ -105,8 +104,7 @@
         <short>The tooltip displayed for this drawer</short>
         <long>
           The text to display in a tooltip for this drawer. This
-          setting is only relevant if the object_type is
-          "drawer-object".
+          key is only relevant if the object_type key is "drawer-object".
         </long>
       </locale>
     </schema>
@@ -121,9 +119,9 @@
       <locale name="C">
         <short>Use a custom icon for the object's button</short>
         <long>
-          If true, the custom_icon setting is used as a custom icon for
-          the button. If false, the custom_icon setting is ignored.
-          This setting is only relevant if the object_type is
+          If true, the custom_icon key is used as a custom icon for
+          the button. If false, the custom_icon key is ignored.
+          This key is only relevant if the object_type key is
           "menu-object" or "drawer-object".
         </long>
       </locale>
@@ -138,9 +136,9 @@
         <short>The icon used for the object's button</short>
         <long>
           The location of the image file used as the icon for the
-          object's button. This setting is only relevant if the
-          object_type is "drawer-object" or "menu-object" and
-          use_custom_icon is true.
+          object's button. This key is only relevant if the
+          object_type key is "drawer-object" or "menu-object" and
+          the use_custom_icon key is true.
         </long>
       </locale>
     </schema>
@@ -155,10 +153,10 @@
       <locale name="C">
         <short>Use a custom path for the menu contents</short>
         <long>
-          If true, the menu_path setting is used as the path from which
+          If true, the menu_path key is used as the path from which
           the menu contents should be constructed. If false, the
-          menu_path setting is ignored. This setting is only relevant
-          if the object_type is "menu-object".
+          menu_path key is ignored. This key is only relevant
+          if the object_type key is "menu-object".
         </long>
       </locale>
     </schema>
@@ -171,9 +169,9 @@
       <locale name="C">
         <short>The path for the menu contents</short>
         <long>
-          The path from which the menu contents is contructed. The
-          setting is only relevant if use_menu_path is true and the
-          object_type is "menu-object".
+          The path from which the menu contents is contructed. This
+          key is only relevant if the use_menu_path key is true and
+	  the object_type key is "menu-object".
         </long>
       </locale>
     </schema>
@@ -189,8 +187,8 @@
         <short>The location of the launcher</short>
         <long>
           The location of the .desktop file describing the launcher.
-          This setting is only relevant if the object_type is
-          "launcher-object".
+          This key is only relevant if the object_type key is
+	  "launcher-object".
         </long>
       </locale>
     </schema>
@@ -207,8 +205,7 @@
         <long>
           The action type this button represents. Possible values are
           "lock", "logout", "run", "search" and "screenshot". This
-          setting is only relevant if the object_type is
-	  "action-applet".
+          key is only relevant if the object_type key is "action-applet".
         </long>
       </locale>
     </schema>
Index: gnome-panel/panel-toplevel.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-toplevel.schemas.in,v
retrieving revision 1.4
diff -u -r1.4 panel-toplevel.schemas.in
--- gnome-panel/panel-toplevel.schemas.in	21 May 2003 09:54:01 -0000	1.4
+++ gnome-panel/panel-toplevel.schemas.in	22 May 2003 18:27:40 -0000
@@ -73,9 +73,9 @@
       <locale name="C">
         <short>The orientation of the panel.</short>
         <long>
-          The orientation of the panel. There are for possible values;
-          "top", "bottom", "left", "right". In expanded mode the value
-          specifies which screen edge the panel is on. In un-expanded
+          The orientation of the panel. Possible values are "top",
+	  "bottom", "left", "right". In expanded mode the value
+	  specifies which screen edge the panel is on. In un-expanded
           mode the difference between "top" and "bottom" is less
           important - both indicate that this is a horizontal panel -
           but still give a useful hint as to how some panel objects
@@ -110,10 +110,10 @@
       <locale name="C">
         <short>The X co-ordinate of the panel.</short>
         <long>
-          The location of the panel along the x-axis. This value only
-          has meaning in un-expanded mode. In expanded mode the value
-          is ignored and the panel is placed at the screen edge
-	  indicated by the orientation.
+          The location of the panel along the x-axis. This key is
+	  only relevant in un-expanded mode. In expanded mode this
+	  key is ignored and the panel is placed at the screen edge
+	  specified by the orientation key.
         </long>
       </locale>
     </schema>
@@ -126,10 +126,10 @@
       <locale name="C">
         <short>The Y co-ordinate of the panel.</short>
         <long>
-          The location of the panel along the y-axis. This value only
-          has meaning in un-expanded mode. In expanded mode the value
-          is ignored and the panel is placed at the screen edge
-	  indicated by the orientation.
+          The location of the panel along the y-axis. This key is
+	  only relevant in un-expanded mode. In expanded mode this
+          key is ignored and the panel is placed at the screen edge
+	  specified by the orientation key.
         </long>
       </locale>
     </schema>
@@ -142,10 +142,10 @@
       <locale name="C">
         <short>Center the panel on the x-axis.</short>
         <long>
-          If true the x setting is ignored and the panel is placed at
+          If true, the x key is ignored and the panel is placed at
           the center of the x-axis of the screen. If the panel is
-	  resized it will remain in that position - i.e. the panel
-	  will grow on both sides. If false the x setting determines
+	  resized it will remain at that position - i.e. the panel
+	  will grow on both sides. If false, the x key specifies 
           the location of the panel.
         </long>
       </locale>
@@ -159,10 +159,10 @@
       <locale name="C">
         <short>Center the panel on the y-axis.</short>
         <long>
-          If true the x setting is ignored and the panel is placed at
+          If true, the x key is ignored and the panel is placed at
           the center of the x-axis of the screen. If the panel is
-	  resized it will remain in that position - i.e. the panel
-	  will grow on both sides. If false the x setting determines
+	  resized it will remain at that position - i.e. the panel
+	  will grow on both sides. If false, the x key determines
           the location of the panel.
         </long>
       </locale>
@@ -176,8 +176,8 @@
       <locale name="C">
         <short>Automatically hide the panel into the corner.</short>
         <long>
-          If true, when the pointer leaves the panel area, it is
-          automatically hidden into a corner of the screen. Moving the
+          If true, the pointer is automatically hidden into a corner
+	  of the screen when it leaves the panel area. Moving the
           pointer to that corner will cause the panel to re-appear.
         </long>
       </locale>
@@ -192,7 +192,7 @@
         <short>Enable animations.</short>
         <long>
           If true, hiding and un-hiding of this panel will be animated
-          rather than happening instantaneously.
+          rather than happening instantly.
         </long>
       </locale>
     </schema>
@@ -221,7 +221,7 @@
         <short>Enable arrows on the hide buttons.</short>
         <long>
           If true, arrows will be placed on the hide buttons. This
-	  preference only has meaning if enable_buttons is true.
+	  key is only relevant if the enable_buttons key is true.
         </long>
       </locale>
     </schema>
@@ -235,8 +235,8 @@
         <short>Delay before automatically hiding the panel.</short>
         <long>
           Specifies the number of milliseconds delay after the pointer
-	  leaves the panel area before the panel is automatically
-          hidden. This preference is only relevant if auto_hide is true.
+	  leaves the panel area before the panel is automatically hidden.
+	  This key is only relevant if the auto_hide key is true.
         </long>
       </locale>
     </schema>
@@ -251,8 +251,8 @@
         <long>
           Specifies the number of milliseconds delay after the pointer
 	  enters the panel area before the panel is automatically
-          re-shown. This preference is only relevant if auto_hide is
-          true.
+	  re-shown. This key is only relevant if the auto_hide key is
+	  true.
         </long>
       </locale>
     </schema>
@@ -266,8 +266,8 @@
         <short>Number of visible pixels with a hidden panel.</short>
         <long>
           Specifies the number of pixels visible when the panel is
-          automatically hidden into a corner. This preference only has
-          relevance when auto_hide is true.
+          automatically hidden into a corner. This key is only
+          relevant if the auto_hide key is true.
         </long>
       </locale>
     </schema>
@@ -280,9 +280,9 @@
       <locale name="C">
         <short>The speed of animations.</short>
         <long>
-          The speed which animations should occur. There are three
-          possible values; "slow", "medium" and "fast". This
-          preference only has relevance if enable_animations is true.
+          The speed which animations should occur. Possible values
+	  are "slow", "medium" and "fast". This key is only relevant
+	  if the enable_animations key is true.
         </long>
       </locale>
     </schema>
@@ -296,11 +296,10 @@
         <short>The background type.</short>
         <long>
           Which type of background should be used for this panel.
-          There are 3 possible values; "gtk", the default GTK+
-          widget background will be used, "color", the color
-          preference will be used as the background color or "image",
-          the image specified in the image preference will be used as
-          the background.
+          Possible values are "gtk" - the default GTK+ widget
+	  background will be used, "color" - the color key will
+	  be used as background color or "image" - the image
+	  specified by the image key will be used as background.
         </long>
       </locale>
     </schema>
@@ -372,7 +371,7 @@
       <locale name="C">
         <short>Stretch the image to the panel.</short>
         <long>
-          If true the image will be scaled to the panel dimensions.
+          If true, the image will be scaled to the panel dimensions.
           The aspect ratio of the image will not be maintained.
         </long>
       </locale>
