From ecd294fa2b9277bec0d3e1c2c979bddc2333f0f8 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Fri, 5 Aug 2011 13:18:52 -0400
Subject: Spell out "and" to match other System Settings panels

---
 data/datetime-dialog.ui                        | 2 +-
 data/indicator-datetime-preferences.desktop.in | 2 +-
 src/datetime-service.c                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index 59d6753..c7729b3 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -414,7 +414,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xpad">1</property>
-            <property name="label" translatable="yes">_Time &amp; Date</property>
+            <property name="label" translatable="yes">_Time and Date</property>
             <property name="use_underline">True</property>
           </object>
           <packing>
diff --git a/data/indicator-datetime-preferences.desktop.in b/data/indicator-datetime-preferences.desktop.in
index 226ae67..7e933c3 100644
--- a/data/indicator-datetime-preferences.desktop.in
+++ b/data/indicator-datetime-preferences.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 
-_Name=Time & Date
+_Name=Time and Date
 _Comment=Change your clock and date settings
 
 Icon=preferences-system-time
diff --git a/src/datetime-service.c b/src/datetime-service.c
index 6c876aa..8897046 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -1110,7 +1110,7 @@ build_menus (DbusmenuMenuitem * root)
 	dbusmenu_menuitem_child_append(root, separator);
 
 	settings = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set     (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings..."));
+	dbusmenu_menuitem_property_set     (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time and Date Settings..."));
 	/* insensitive until we check for available apps */
 	dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 	g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center indicator-datetime");
-- 
cgit v1.2.3