Merge lp:~jbicha/indicator-datetime/spell-out-and into lp:indicator-datetime/0.3

[Jeremy Bícha]

[lp:~jbicha/indicator-datetime/spell-out-and]

120. By Jeremy Bícha on 2011-08-05

Use real ellipsis (LP: #621339)

[Matthew Paul Thomas (mpt)]

+1 to using real ellipses! Thanks.

For "&" vs. "and", I think it's better for menus, buttons, and window titles to use "&", because it makes the other words in the label easier to scan. (The same reason that those labels have most words capitalized, but not short non-terminal articles and prepositions.) That's why the Time & Date settings panel itself uses "&".

review: Needs Fixing (design)

[Jeremy Bícha (jbicha)]

Thanks for the review. In the System Settings overview, "Time & Date" doesn't match "Messaging and VOIP Accounts", "Region and Language" or "Mouse and Touchpad". Do we intend to patch all of those to use the ampersand instead?

review: Needs Information

[Matthew Paul Thomas (mpt)]

I don't know if anyone intends to, but I think it would be an improvement.

[Ted Gould (ted)]

Merged in the ellipsis change and not the & change.

review: Approve

=== 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:51:58 +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:51:58 +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:51:58 +0000
@@ -491,7 +491,7 @@
 		dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 		dbusmenu_menuitem_child_add_position(root, events_separator, 2);
 		add_appointment = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event..."));
+		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event…"));
 		dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 		g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar");
 		dbusmenu_menuitem_child_add_position (root, add_appointment, 3);
@@ -1059,7 +1059,7 @@
 	g_debug("Building Menus.");
 	if (date == NULL) {
 		date = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (date, DBUSMENU_MENUITEM_PROP_LABEL, _("No date yet..."));
+		dbusmenu_menuitem_property_set     (date, DBUSMENU_MENUITEM_PROP_LABEL, _("No date yet…"));
 		dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 		dbusmenu_menuitem_child_append(root, date);
 
@@ -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");