diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index b5dadaedb..1502e39a2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-02  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/dialog.glade: Consistent tooltips.
+	* src/gramps.glade: Likewise.
+	* src/marriage.glade: Likewise.
+	* src/edit_person.glade: Likewise.
+	* src/plugins/pafexport.glade: Consistent check box label. 
+
 2003-08-01  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/plugins/writeftree.glade: Swap OK and Cancel buttons (HIG).
 	* src/plugins/cdexport.glade: Likewise.
diff --git a/gramps2/src/dialog.glade b/gramps2/src/dialog.glade
index 1f5aebbf8..e6015d006 100644
--- a/gramps2/src/dialog.glade
+++ b/gramps2/src/dialog.glade
@@ -1788,7 +1788,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button121">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept and close</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
@@ -2523,7 +2523,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button124">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept and close</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
@@ -2756,7 +2756,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button119">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Reject changes and close</property>
+	      <property name="tooltip" translatable="yes">Abandon changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-cancel</property>
@@ -2770,7 +2770,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button118">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept and close</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
diff --git a/gramps2/src/edit_person.glade b/gramps2/src/edit_person.glade
index e1bf4deb4..bb1fc50e6 100644
--- a/gramps2/src/edit_person.glade
+++ b/gramps2/src/edit_person.glade
@@ -45,7 +45,7 @@
 	  <child>
 	    <widget class="GtkButton" id="applyPerson">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept changes and close dialog</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index 646baf02d..5aa64b126 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -1184,7 +1184,7 @@
 			  <child>
 			    <widget class="GtkCheckButton" id="invert">
 			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">Show persons that do not match the filtering rule</property>
+			      <property name="tooltip" translatable="yes">Show people that do not match the filtering rule</property>
 			      <property name="can_focus">True</property>
 			      <property name="label" translatable="yes">Invert</property>
 			      <property name="use_underline">True</property>
@@ -4656,7 +4656,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button90">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Reject changes and close</property>
+	      <property name="tooltip" translatable="yes">Abandon changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-cancel</property>
@@ -4670,7 +4670,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button88">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept and close</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
diff --git a/gramps2/src/marriage.glade b/gramps2/src/marriage.glade
index 1f134d882..6a062fd9c 100644
--- a/gramps2/src/marriage.glade
+++ b/gramps2/src/marriage.glade
@@ -32,7 +32,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button108">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Reject changes and close</property>
+	      <property name="tooltip" translatable="yes">Abandon changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-cancel</property>
@@ -46,7 +46,7 @@
 	  <child>
 	    <widget class="GtkButton" id="button107">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Accept and close</property>
+	      <property name="tooltip" translatable="yes">Accept changes and close window</property>
 	      <property name="can_default">True</property>
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
diff --git a/gramps2/src/plugins/pafexport.glade b/gramps2/src/plugins/pafexport.glade
index 5f8532039..c6eedd988 100644
--- a/gramps2/src/plugins/pafexport.glade
+++ b/gramps2/src/plugins/pafexport.glade
@@ -289,7 +289,7 @@
                       <widget class="GtkCheckButton" id="restrict">
                         <property name="border_width">3</property>
                         <property name="can_focus">yes</property>
-                        <property name="label" translatable="yes">Restrict data on living people</property>
+                        <property name="label" translatable="yes">Restrict information on living people</property>
                         <property name="active">yes</property>
                         <property name="draw_indicator">yes</property>
                         <property name="visible">yes</property>