diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-08-22 13:32:00 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-08-22 13:32:00 +0100 |
| commit | 397ce19ba4e460dbb3bfb4a4b7b06d98918c153b (patch) | |
| tree | f1c03f830718148fc7184cf0e4240b874b82f07d | |
| parent | 3dd1acc6b1514a255179e29642bc5b9929b80cff (diff) | |
| parent | 6dc0245f7ec5015a5e2e7a19994b3d417aeb9867 (diff) | |
| download | ayatana-indicator-session-397ce19ba4e460dbb3bfb4a4b7b06d98918c153b.tar.gz ayatana-indicator-session-397ce19ba4e460dbb3bfb4a4b7b06d98918c153b.tar.bz2 ayatana-indicator-session-397ce19ba4e460dbb3bfb4a4b7b06d98918c153b.zip | |
ellipsis fixes
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | src/dialog.c | 6 | ||||
| -rw-r--r-- | src/indicator-session.c | 4 |
4 files changed, 18 insertions, 5 deletions
@@ -38,6 +38,7 @@ debian/indicator-sus.substvars gtk-logout-helper .deps .libs +test-ellipsis src/libsession.la src/libsession_la-indicator-session.lo src/status-provider-pidgin-marshal.c diff --git a/Makefile.am b/Makefile.am index 391ff49..5850769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,15 @@ dist-hook: else \ echo Failed to generate AUTHORS: not a branch >&2; \ fi + +TESTS = \ + test-ellipsis + +test-ellipsis: po + @echo "#!/bin/bash" > $@ + @echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@ + @echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@ + @echo "exit 0" >> $@ + @chmod +x $@ + +CLEANFILES = $(TESTS) diff --git a/src/dialog.c b/src/dialog.c index 299f954..45cfdcb 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -53,15 +53,15 @@ static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = { they are also going to get a password dialog to do the action. */ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = { /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"), - /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."), - /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down...") + /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart…"), + /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Shut Down…") }; /* TRANSLATORS: This button appears on the logout dialog when there are updates that require restart. It will do a restart in place of a log out. */ static const gchar * restart_updates = N_("Restart Instead"); -static const gchar * restart_auth = N_("Restart Instead..."); +static const gchar * restart_auth = N_("Restart Instead…"); static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts."); static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = { diff --git a/src/indicator-session.c b/src/indicator-session.c index f6727d9..c980378 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -527,7 +527,7 @@ switch_property_change (DbusmenuMenuitem * item, if (variant == NULL || g_variant_get_string(variant, NULL) == NULL || g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) { - finalstring = _("Switch User..."); + finalstring = _("Switch User…"); set_ellipsize = FALSE; } @@ -554,7 +554,7 @@ switch_property_change (DbusmenuMenuitem * item, gdouble ems = width / pixels_per_em; g_debug("Username width %fem", ems); - finalstring = g_strdup_printf(_("Switch From %s..."), username); + finalstring = g_strdup_printf(_("Switch From %s…"), username); if (ems >= 20.0f) { set_ellipsize = TRUE; } else { |