diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 01:06:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-22 01:06:45 +0800 |
| commit | 84c2e3735ce6e4df88142e86446f9179b6e341e4 (patch) | |
| tree | 7e6d2043810d0c37ee2581f0783095aefdec1e1b /plugins/vcard-inline | |
| parent | aaa180af5abef44bb3e3d3c3c5968ca191a3dbda (diff) | |
| parent | 2914345f9672559fed0ad88d2841ea4801d8d244 (diff) | |
| download | gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.gz gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.tar.zst gsoc2013-evolution-84c2e3735ce6e4df88142e86446f9179b6e341e4.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/component/addressbook-view.c
addressbook/gui/component/component-factory.c
addressbook/gui/component/eab-composer-util.h
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/e-addressbook-model.c
addressbook/gui/widgets/e-addressbook-view.c
addressbook/gui/widgets/e-addressbook-view.h
addressbook/gui/widgets/eab-gui-util.c
addressbook/gui/widgets/eab-gui-util.h
addressbook/gui/widgets/eab-menu.h
addressbook/gui/widgets/eab-popup.h
calendar/gui/calendar-component.c
calendar/gui/e-cal-event.h
calendar/gui/e-calendar-table.c
calendar/gui/e-calendar-view.c
calendar/gui/e-calendar-view.h
calendar/gui/e-memo-table.c
calendar/gui/memos-component.c
calendar/gui/tasks-component.c
composer/e-composer-header-table.c
composer/e-composer-private.h
composer/e-msg-composer.c
composer/e-msg-composer.h
composer/evolution-composer.ui
configure.ac
data/icons/Makefile.am
em-format/em-format.c
em-format/em-format.h
mail/Makefile.am
mail/e-mail-shell-migrate.c
mail/e-searching-tokenizer.c
mail/e-searching-tokenizer.h
mail/em-composer-utils.c
mail/em-composer-utils.h
mail/em-folder-browser.c
mail/em-folder-tree-model.c
mail/em-folder-view.c
mail/em-format-html-display.c
mail/em-format-html-display.h
mail/em-mailer-prefs.c
mail/em-message-browser.c
plugins/vcard-inline/Makefile.am
plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
plugins/vcard-inline/vcard-inline.c
shell/e-component-registry.h
shell/e-shell-window.c
shell/es-menu.h
widgets/misc/e-filter-bar.c
widgets/misc/e-filter-bar.h
widgets/misc/e-search-bar.c
widgets/misc/e-search-bar.h
Diffstat (limited to 'plugins/vcard-inline')
| -rw-r--r-- | plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml | 4 | ||||
| -rw-r--r-- | plugins/vcard-inline/vcard-inline.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml index c54587d369..f9b2c1693e 100644 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml @@ -14,11 +14,11 @@ <hook class="org.gnome.evolution.mail.format:1.0"> <group id="EMFormatHTMLDisplay"> <item - mime_type="text/vCard" + mime_type="text/vcard" format="org_gnome_vcard_inline_format" flags="inline_disposition"/> <item - mime_type="text/x-vCard" + mime_type="text/x-vcard" format="org_gnome_vcard_inline_format" flags="inline_disposition"/> </group> diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 211eb69c2d..0e10b3a82a 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -224,8 +224,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, } else if (length > 2) { gchar *text; - text = g_strdup_printf ( - _("There are %d other contacts."), length - 1); + /* Translators: This will always be two or more. */ + text = g_strdup_printf (ngettext ( + "There is %d other contact.", + "There are %d other contacts.", + length - 1), length - 1); gtk_label_set_text (GTK_LABEL (widget), text); gtk_widget_show (widget); g_free (text); |