diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-12 11:36:52 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-12 11:36:52 -0500 |
| commit | 3b359094448cfd02f2c571041bb0ce5a74e1249e (patch) | |
| tree | cf307f46303d8ed5aa37e6b2137d7645c1780871 /src | |
| parent | dda06df8cd9fd0186d81701c72ff2e6fa36f5658 (diff) | |
| parent | 0990eec16f54851e748a3bcbfb864777b6a0c959 (diff) | |
| download | ayatana-indicator-session-3b359094448cfd02f2c571041bb0ce5a74e1249e.tar.gz ayatana-indicator-session-3b359094448cfd02f2c571041bb0ce5a74e1249e.tar.bz2 ayatana-indicator-session-3b359094448cfd02f2c571041bb0ce5a74e1249e.zip | |
Merge in Ubuntu Desktop
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 5 | ||||
| -rw-r--r-- | src/session-service.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f82d32f..9e4836b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -40,7 +40,10 @@ libexec_PROGRAMS = indicator-session-service$(EXEEXT) \ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/session-service.c b/src/session-service.c index 4fc12a1..5d2ca1c 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -629,7 +629,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); } else { - dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); + dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out\342\200\246")); } dbusmenu_menuitem_property_set_bool(logout_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_logout()); dbusmenu_menuitem_child_append(root, logout_mi); @@ -654,7 +654,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246")); } dbusmenu_menuitem_property_set_bool(restart_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_restart()); dbusmenu_menuitem_child_append(root, restart_mi); @@ -664,7 +664,7 @@ rebuild_items (DbusmenuMenuitem *root, if (supress_confirmations()) { dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down")); } else { - dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down...")); + dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down\342\200\246")); } dbusmenu_menuitem_property_set_bool(shutdown_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, show_shutdown()); dbusmenu_menuitem_child_append(root, shutdown_mi); @@ -728,9 +728,9 @@ restart_dir_changed (void) if (restart_required) { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart To Complete Update\342\200\246")); } dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "system-restart-panel"); if (session_dbus != NULL) { @@ -740,7 +740,7 @@ restart_dir_changed (void) if (supress_confirmations()) { dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart\342\200\246")); } dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON); if (session_dbus != NULL) { |