From f76933cb585dc0449afaece825b1cda4989ff0ca Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 23 Apr 2008 01:29:10 +0000
Subject: ** Fixes bug #529465

2008-04-22  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #529465

	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
	Prefer "popup" to "pop-up" per the GNOME Documentation Style Guide.


svn path=/trunk/; revision=35403
---
 addressbook/ChangeLog                                              | 7 +++++++
 addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index f84103fe87..49fba26257 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #529465
+
+	* gui/component/GNOME_Evolution_Addressbook.server.in.in:
+	Prefer "popup" to "pop-up" per the GNOME Documentation Style Guide.
+
 2008-04-17  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #526739
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
index e41f47cb2e..feef3bdfc9 100644
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
+++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
@@ -78,7 +78,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="name" type="string"
-		       _value="Evolution Address Book address pop-up"/>
+		       _value="Evolution Address Book address popup"/>
 
 </oaf_server>
 
-- 
cgit v1.2.3