ayatana-commits team mailing list archive

[Jeremy Bicha <jeremy@xxxxxxxxx>]

Jeremy Bicha has proposed merging lp:~jbicha/indicator-datetime/spell-out-and into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~jbicha/indicator-datetime/spell-out-and/+merge/70604
-- 
https://code.launchpad.net/~jbicha/indicator-datetime/spell-out-and/+merge/70604
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'data/datetime-dialog.ui'
--- data/datetime-dialog.ui	2011-06-29 13:10:25 +0000
+++ data/datetime-dialog.ui	2011-08-05 17:21:31 +0000
@@ -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>

=== modified file 'data/indicator-datetime-preferences.desktop.in'
--- data/indicator-datetime-preferences.desktop.in	2011-06-29 13:10:25 +0000
+++ data/indicator-datetime-preferences.desktop.in	2011-08-05 17:21:31 +0000
@@ -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

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-07-07 21:17:58 +0000
+++ src/datetime-service.c	2011-08-05 17:21:31 +0000
@@ -1110,7 +1110,7 @@
 	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");