? gnome-panel/gnome-panel-preferences.glade.NEU
? gnome-panel/panel-properties-dialog.glade.NEU
? applets/fish/fish.glade.NEU
? applets/wncklet/window-list.glade.NEU
? applets/wncklet/workspace-switcher.glade.NEU
Index: gnome-panel/gnome-panel-screenshot.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/gnome-panel-screenshot.c,v
retrieving revision 1.51
diff -u -r1.51 gnome-panel-screenshot.c
--- gnome-panel/gnome-panel-screenshot.c	5 Mar 2003 22:28:38 -0000	1.51
+++ gnome-panel/gnome-panel-screenshot.c	7 May 2003 21:09:30 -0000
@@ -765,7 +765,7 @@
 					 0 /* flags */,
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK,
-					 _("Not enough room to write file %s"),
+					 _("Not enough disk space to write file %s"),
 					 filename ? filename : "(null)");
 				gtk_dialog_run (GTK_DIALOG (dialog));
 				gtk_widget_destroy (dialog);
Index: gnome-panel/gnome-panel-screenshot.glade
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/gnome-panel-screenshot.glade,v
retrieving revision 1.11
diff -u -r1.11 gnome-panel-screenshot.glade
--- gnome-panel/gnome-panel-screenshot.glade	4 Dec 2002 16:53:54 -0000	1.11
+++ gnome-panel/gnome-panel-screenshot.glade	7 May 2003 21:09:30 -0000
@@ -233,7 +233,7 @@
 		  <child>
 		    <widget class="GtkRadioButton" id="web_rbutton">
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Save screenshot to _web page (save in ~/public__html)</property>
+		      <property name="label" translatable="yes">Save screenshot to _web page (save in ~/public_html)</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="active">False</property>
Index: gnome-panel/launcher.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/launcher.c,v
retrieving revision 1.235
diff -u -r1.235 launcher.c
--- gnome-panel/launcher.c	16 Apr 2003 09:39:43 -0000	1.235
+++ gnome-panel/launcher.c	7 May 2003 21:09:31 -0000
@@ -270,8 +270,8 @@
 		panel_error_dialog (
 			launcher_get_screen (launcher),
 			"cannot_launch_icon",
-			_("Cannot launch icon\n%s"),
-			error->message);
+			_("<b>Cannot launch icon</b>\n\n"
+			"Details: %s"), error->message);
 		g_clear_error (&error);
 	}
 
Index: gnome-panel/menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu.c,v
retrieving revision 1.658
diff -u -r1.658 menu.c
--- gnome-panel/menu.c	11 Apr 2003 00:50:36 -0000	1.658
+++ gnome-panel/menu.c	7 May 2003 21:09:32 -0000
@@ -121,7 +121,7 @@
 	{ N_("Lock"),
 	  N_("Actions"),
 	  "Actions",
-	  N_("Lock the screen so you can temporarily leave your computer"),
+	  N_("Lock the screen so that you can temporarily leave the computer"),
 	  NULL,
 	  PANEL_STOCK_LOCKSCREEN,
 	  PANEL_ACTION_LOCK,
@@ -141,7 +141,7 @@
 	{ N_("Search"),
 	  N_("Actions"),
 	  "Actions",
-	  N_("Find files, folders, and documents on your computer"),
+	  N_("Find files, folders, and documents on the computer"),
 	  NULL,
 	  PANEL_STOCK_SEARCHTOOL,
 	  PANEL_ACTION_SEARCH,
@@ -3149,7 +3149,7 @@
 		setup_internal_applet_drag(menuitem, "ACTION:lock:NEW");
 		gtk_tooltips_set_tip (panel_tooltips, menuitem,
 				      _("Lock the screen so that you can "
-					"temporarily leave your computer"), NULL);
+					"temporarily leave the computer"), NULL);
 	}
 
 	menuitem = gtk_image_menu_item_new ();
@@ -3161,7 +3161,7 @@
 	setup_internal_applet_drag(menuitem, "ACTION:logout:NEW");
 	gtk_tooltips_set_tip (panel_tooltips, menuitem,
 			      _("Log out of this session to log in as "
-				"a different user or to shut down your "
+				"a different user or to shut down the "
 				"computer"),
 			      NULL);
 
@@ -3337,7 +3337,7 @@
 		gtk_menu_shell_append (GTK_MENU_SHELL (root_menu), menuitem);
 		gtk_tooltips_set_tip (panel_tooltips, menuitem,
 				      _("Find files, folders, and documents "
-					"on your computer"),
+					"on the computer"),
 				      NULL);
 		g_signal_connect (menuitem, "activate",
 				  G_CALLBACK (panel_action_search), NULL);
Index: gnome-panel/panel-bindings.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-bindings.c,v
retrieving revision 1.2
diff -u -r1.2 panel-bindings.c
--- gnome-panel/panel-bindings.c	5 Mar 2003 01:11:34 -0000	1.2
+++ gnome-panel/panel-bindings.c	7 May 2003 21:09:32 -0000
@@ -164,7 +164,7 @@
 				(GConfClientNotifyFunc) panel_binding_changed,
 				binding, NULL, &error);
 	if (error) {
-		g_warning (_("Error watching gconf key '%s': %s"), key, error->message);
+		g_warning (_("Error watching GConf key '%s': %s"), key, error->message);
 		g_error_free (error);
 	}
 }
@@ -182,7 +182,7 @@
 	gconf_client_add_dir (client, BINDINGS_PREFIX,
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, &error);
 	if (error) {
-		g_warning (_("Error loading gconf dir '%s': %s"),
+		g_warning (_("Error loading GConf dir '%s': %s"),
 			   BINDINGS_PREFIX, error->message),
 		g_error_free (error);
 	}
Index: gnome-panel/panel-general.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-general.schemas.in,v
retrieving revision 1.4
diff -u -r1.4 panel-general.schemas.in
--- gnome-panel/panel-general.schemas.in	7 May 2003 17:40:39 -0000	1.4
+++ gnome-panel/panel-general.schemas.in	7 May 2003 21:09:32 -0000
@@ -9,7 +9,7 @@
       <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
@@ -41,7 +41,7 @@
       <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
@@ -57,7 +57,7 @@
       <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
@@ -74,7 +74,7 @@
       <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
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	7 May 2003 21:09:32 -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.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel.c,v
retrieving revision 1.513
diff -u -r1.513 panel.c
--- gnome-panel/panel.c	9 Apr 2003 06:57:43 -0000	1.513
+++ gnome-panel/panel.c	7 May 2003 21:09:33 -0000
@@ -1168,7 +1168,7 @@
 			GTK_MESSAGE_QUESTION,
 			GTK_BUTTONS_NONE,
 			_("When a panel is deleted, the panel "
-			"and its\n settings are lost. "
+			"and it's settings are lost.\n\n"
 			"Delete this panel?"));
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
Index: applets//wncklet/window-list.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/window-list.schemas.in,v
retrieving revision 1.11
diff -u -r1.11 window-list.schemas.in
--- applets//wncklet/window-list.schemas.in	9 Jan 2003 23:02:54 -0000	1.11
+++ applets//wncklet/window-list.schemas.in	7 May 2003 21:09:33 -0000
@@ -34,8 +34,9 @@
         <default>true</default>
         <locale name="C">
           <short>Move windows to the current workspace when unminimized</short>
-          <long>If true, then when unminimizing a window, bring it to the current workspace.
-	        Otherwise, change to the workspace of the window.
+          <long>If true, then when unminimizing a window, move it to the 
+	  	current workspace. Otherwise, change to the workspace of the
+		window.
 	  </long>
         </locale>
       </schema>
@@ -47,10 +48,7 @@
         <default>50</default>
         <locale name="C">
           <short>Minimum size that Window List requests</short>
-          <long>To be usable, Window List requires a minimum width. Window List
-		requests this minimum width. The minimum width setting is useful
-		for sliding and edge panels, which usually request a small
-		default width.
+          <long>This value is the minimum width that Window List requests.
 	  </long>
         </locale>
       </schema>
@@ -64,8 +62,8 @@
           <short>Maximum size that Window List requests</short>
           <long>This value is the maximum width that Window List requests. The
 		maximum width setting is useful to limit the size of Window
-		List in large panels such as edge panels, where Window List
-		could fill the entire space available.
+		List in large panels, where Window List	could fill the entire
+		space available.
 	  </long>
         </locale>
       </schema>
