From 592375b3a00eb559bbf4011bd2b26decc905b22f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 23 Apr 2008 01:23:42 +0000
Subject: ** Fixes bug #529641

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

	** Fixes bug #529641

	* widgets/e-timezone-dialog/e-timezone-dialog.glade:
	* widgets/e-dateedit.c (create_children):
	* widgets/e-map.c (e_map_new):
	Prefer the term "drop-down combination box" to "combo box" per the
	GNOME Documentation Style Guide.


svn path=/trunk/; revision=35402
---
 widgets/ChangeLog                                 | 8 ++++++++
 widgets/e-timezone-dialog/e-timezone-dialog.glade | 2 +-
 widgets/misc/ChangeLog                            | 9 +++++++++
 widgets/misc/e-dateedit.c                         | 2 +-
 widgets/misc/e-map.c                              | 2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 5f209d6f61..c904fc2fe7 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-22  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #529641
+
+	* e-timezone-dialog/e-timezone-dialog.glade:
+	Prefer the term "drop-down combination box" to "combo box" per the
+	GNOME Documentation Style Guide.
+
 2008-02-23  Andre Klapper  <a9016009@gmx.de>
 
 	* e-timezone-dialog/e-timezone-dialog.glade:
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.glade b/widgets/e-timezone-dialog/e-timezone-dialog.glade
index fbac75242a..f23ee27027 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.glade
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.glade
@@ -289,7 +289,7 @@ Use the right mouse button to zoom out.</property>
 		  <property name="add_tearoffs">False</property>
 		  <property name="focus_on_click">True</property>
 		  <accessibility>
-		    <atkproperty name="AtkObject::accessible_name" translatable="yes">TimeZone Combobox</atkproperty>
+		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Timezone drop-down combination box</atkproperty>
 		  </accessibility>
 		</widget>
 		<packing>
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 1f9093d2e4..8769db20e9 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-22  Matthew Barnes  <mbarnes@Redhat.com>
+
+	** Fixes part of bug #529641
+
+	* e-dateedit.c (create_children):
+	* e-map.c (e_map_new):
+	Prefer the term "drop-down combination box" to "combo box" per the
+	GNOME Documentation Style Guide.
+
 2008-04-20  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #334444
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 1a49bf2bfa..d7ac43adcf 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -406,7 +406,7 @@ create_children			(EDateEdit	*dedit)
 	gtk_widget_set_name (priv->time_combo, "e-dateedit-timecombo");
 	rebuild_time_popup (dedit);
 	a11y = gtk_widget_get_accessible (priv->time_combo);
-	atk_object_set_description (a11y, _("Combo box to select time"));
+	atk_object_set_description (a11y, _("Drop-down combination box to select time"));
 	atk_object_set_name (a11y, _("Time"));
 
 	g_signal_connect (GTK_BIN (priv->time_combo)->child,
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 758d4f960c..44051101c4 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -625,7 +625,7 @@ e_map_new (void)
 	a11y = gtk_widget_get_accessible (widget);
 	atk_object_set_name (a11y, _("World Map"));
 	atk_object_set_role (a11y, ATK_ROLE_IMAGE);
-	atk_object_set_description (a11y, _("Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."));
+	atk_object_set_description (a11y, _("Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."));
 	return (E_MAP (widget));
 }
 
-- 
cgit v1.2.3