[evolution/webkit-composer: 35/38] Merge branch 'master' into webkit-composer
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 35/38] Merge branch 'master' into webkit-composer
- Date: Mon, 20 Aug 2012 15:15:10 +0000 (UTC)
commit 77dc16264afc5d2c432b2b8f4db86495ca57eed2
Merge: 1f3a3da c23dd1b
Author: Dan VrÃtil <dvratil redhat com>
Date: Mon Aug 20 15:45:15 2012 +0200
Merge branch 'master' into webkit-composer
NEWS | 62 +
.../gui/contact-editor/e-contact-editor-fullname.c | 26 +-
addressbook/gui/contact-editor/e-contact-editor.c | 70 +-
.../gui/contact-editor/e-contact-quick-add.c | 2 +-
addressbook/gui/merging/eab-contact-compare.c | 2 +-
addressbook/gui/merging/eab-contact-merging.c | 2 +-
.../gui/widgets/e-addressbook-table-adapter.c | 2 +-
addressbook/gui/widgets/e-minicard-label.c | 8 +-
addressbook/gui/widgets/e-minicard-view.c | 2 +-
addressbook/gui/widgets/e-minicard.c | 10 +-
addressbook/gui/widgets/eab-contact-display.c | 2 +-
addressbook/gui/widgets/eab-contact-formatter.c | 19 +-
addressbook/gui/widgets/eab-contact-formatter.h | 4 +-
addressbook/importers/evolution-csv-importer.c | 120 +-
addressbook/importers/evolution-ldif-importer.c | 16 +-
addressbook/importers/evolution-vcard-importer.c | 26 +-
addressbook/printing/e-contact-print.c | 62 +-
calendar/alarm-notify/alarm-queue.c | 4 +-
calendar/alarm-notify/util.c | 6 +-
calendar/calendar.error.xml | 2 +-
calendar/gui/dialogs/comp-editor.c | 2 +-
calendar/gui/dialogs/event-page.c | 16 +-
calendar/gui/dialogs/memo-page.c | 8 +-
calendar/gui/dialogs/task-page.c | 2 +-
calendar/gui/e-alarm-list.c | 10 +-
calendar/gui/e-cal-component-preview.c | 9 +-
calendar/gui/e-cal-model-memos.c | 2 +-
calendar/gui/e-cal-model.c | 2 +-
calendar/gui/e-calendar-view.c | 4 +-
calendar/gui/e-day-view.c | 26 +-
calendar/gui/e-meeting-list-view.c | 2 +-
calendar/gui/e-week-view.c | 18 +-
calendar/gui/ea-cal-view-event.c | 2 +-
calendar/gui/ea-cal-view.c | 6 +-
calendar/gui/ea-calendar.c | 2 +-
calendar/gui/ea-day-view-cell.c | 2 +-
calendar/gui/ea-day-view.c | 2 +-
calendar/gui/ea-gnome-calendar.c | 2 +-
calendar/gui/ea-week-view-cell.c | 2 +-
calendar/gui/ea-week-view-main-item.c | 14 +-
calendar/gui/ea-week-view.c | 4 +-
calendar/gui/gnome-cal.c | 2 +-
calendar/gui/itip-utils.c | 12 +-
calendar/gui/misc.c | 6 +-
calendar/gui/print.c | 14 +-
calendar/importers/icalendar-importer.c | 38 +-
composer/e-msg-composer.c | 6 +-
configure.ac | 5 +-
e-util/e-config.c | 127 +-
e-util/e-dialog-utils.c | 9 +-
e-util/e-event.c | 21 +-
e-util/e-file-request.c | 13 +-
e-util/e-html-utils.c | 51 +-
e-util/e-import.c | 4 +-
e-util/e-mktemp.c | 18 +-
e-util/e-plugin-ui.c | 6 +-
e-util/e-plugin.c | 45 +-
e-util/e-stock-request.c | 20 +-
e-util/e-text-event-processor.c | 36 +-
e-util/e-unicode.c | 6 +-
e-util/e-util.c | 20 +-
em-format/e-mail-extension-registry.c | 4 +-
em-format/e-mail-formatter-attachment.c | 2 +-
em-format/e-mail-formatter-headers.c | 12 +-
em-format/e-mail-formatter-message-rfc822.c | 2 +-
em-format/e-mail-formatter-quote-headers.c | 22 +-
em-format/e-mail-formatter-quote-message-rfc822.c | 2 +-
em-format/e-mail-formatter-quote-text-plain.c | 6 +-
em-format/e-mail-formatter-secure-button.c | 20 +-
em-format/e-mail-formatter-text-enriched.c | 2 +-
em-format/e-mail-formatter-text-html.c | 4 +-
em-format/e-mail-formatter-text-plain.c | 6 +-
em-format/e-mail-formatter-utils.c | 14 +-
em-format/e-mail-formatter.c | 10 +-
em-format/e-mail-inline-filter.c | 4 +-
em-format/e-mail-parser-application-mbox.c | 2 +-
em-format/e-mail-parser-application-smime.c | 2 +-
em-format/e-mail-parser-inlinepgp-encrypted.c | 4 +-
em-format/e-mail-parser-inlinepgp-signed.c | 4 +-
em-format/e-mail-parser-message-deliverystatus.c | 2 +-
em-format/e-mail-parser-message-external.c | 16 +-
em-format/e-mail-parser-message-rfc822.c | 2 +-
em-format/e-mail-parser-multipart-alternative.c | 4 +-
em-format/e-mail-parser-multipart-appledouble.c | 4 +-
em-format/e-mail-parser-multipart-digest.c | 4 +-
em-format/e-mail-parser-multipart-encrypted.c | 10 +-
em-format/e-mail-parser-multipart-mixed.c | 4 +-
em-format/e-mail-parser-multipart-related.c | 6 +-
em-format/e-mail-parser-multipart-signed.c | 12 +-
em-format/e-mail-parser.c | 10 +-
em-format/e-mail-part-utils.c | 10 +-
filter/e-filter-code.c | 4 +-
filter/e-filter-color.c | 24 +-
filter/e-filter-datespec.c | 46 +-
filter/e-filter-element.c | 2 +-
filter/e-filter-file.c | 4 +-
filter/e-filter-input.c | 2 +-
filter/e-filter-int.c | 4 +-
filter/e-filter-option.c | 42 +-
filter/e-filter-option.h | 6 +-
filter/e-filter-part.c | 22 +-
filter/e-filter-rule.c | 26 +-
filter/e-rule-context.c | 10 +-
help/C/calendar-meetings-delegating.page | 2 +-
help/C/contacts-searching.page | 16 +-
help/C/exporting-data-calendar.page | 1 +
help/C/mail-calendar-sending-invitations.page | 2 +-
help/C/mail-composer-message-templates-reply.page | 39 +
help/C/mail-composer-message-templates-save.page | 52 +
.../mail-composer-message-templates-variables.page | 62 +
help/C/mail-composer-message-templates.page | 89 +-
help/C/mail-search-folders-enable.page | 15 +-
help/C/mail-searching.page | 12 +-
help/C/mail-spam-groupwise-add-to-list.page | 36 -
help/C/mail-spam-groupwise-manage-list.page | 34 -
help/C/mail-spam-groupwise-mark-message.page | 28 -
help/C/mail-spam-groupwise-remove-from-list.page | 30 -
help/C/mail-spam-groupwise-unmark-message.page | 32 -
help/C/mail-spam.page | 5 +-
help/C/memos-searching.page | 14 +-
help/C/tasks-searching.page | 14 +-
help/Makefile.am | 20 +-
libemail-engine/e-mail-session-utils.c | 4 +-
libemail-engine/e-mail-session.c | 4 +-
libemail-engine/e-mail-utils.c | 30 +-
libemail-engine/mail-folder-cache.c | 29 +-
libemail-engine/mail-ops.c | 36 +-
libemail-engine/mail-tools.c | 8 +-
libemail-engine/mail-vfolder.c | 50 +-
libemail-utils/em-filter-folder-element.c | 6 +-
libemail-utils/em-vfolder-context.c | 2 +-
libemail-utils/em-vfolder-rule.c | 46 +-
libemail-utils/mail-mt.c | 13 +-
libevolution-utils/e-alert.c | 26 +-
libevolution-utils/e-xml-utils.c | 15 +-
libevolution-utils/evolution-util.c | 5 +-
mail/e-http-request.c | 312 +-
mail/e-mail-backend.c | 2 +-
mail/e-mail-browser.c | 7 +-
mail/e-mail-config-confirm-page.c | 6 +-
mail/e-mail-config-welcome-page.c | 2 +-
mail/e-mail-display-popup-extension.c | 3 +-
mail/e-mail-display.c | 144 +-
mail/e-mail-label-manager.c | 2 +-
mail/e-mail-migrate.c | 2 +-
mail/e-mail-notebook-view.c | 13 +-
mail/e-mail-paned-view.c | 10 +-
mail/e-mail-printer.c | 96 +-
mail/e-mail-reader-utils.c | 31 +-
mail/e-mail-reader.c | 23 +-
mail/e-mail-request.c | 14 +-
mail/e-mail-ui-session.c | 3 -
mail/em-composer-utils.c | 5 +-
mail/em-filter-editor-folder-element.c | 4 +-
mail/em-filter-editor.c | 3 +-
mail/em-filter-rule.c | 40 +-
mail/em-filter-source-element.c | 16 +-
mail/em-folder-tree.c | 7 +-
mail/em-folder-utils.c | 14 +-
mail/em-utils.c | 45 +-
mail/em-vfolder-editor-context.c | 2 +-
mail/em-vfolder-editor-rule.c | 44 +-
mail/importers/elm-importer.c | 22 +-
mail/importers/evolution-mbox-importer.c | 11 +-
mail/importers/mail-importer.c | 10 +-
mail/importers/pine-importer.c | 34 +-
mail/mail-autofilter.c | 22 +-
mail/mail-send-recv.c | 24 +-
mail/mail-vfolder-ui.c | 6 +-
mail/message-list.c | 260 +-
modules/addressbook/e-book-shell-view-private.c | 27 +-
.../audio-inline/e-mail-formatter-audio-inline.c | 16 +-
modules/audio-inline/e-mail-parser-audio-inline.c | 4 +-
.../backup-restore/e-mail-config-restore-page.c | 2 +-
modules/backup-restore/evolution-backup-tool.c | 2 +-
modules/bogofilter/evolution-bogofilter.c | 2 +-
.../evolution-cal-config-weather.c | 2 +-
modules/calendar/e-cal-shell-content.c | 214 +
modules/calendar/e-cal-shell-content.h | 15 +-
modules/calendar/e-cal-shell-view-actions.c | 4 +-
modules/calendar/e-cal-shell-view-actions.h | 2 +
modules/calendar/e-cal-shell-view-private.c | 110 +-
modules/calendar/e-cal-shell-view.c | 225 +-
modules/calendar/e-calendar-preferences.c | 5 +-
modules/calendar/e-calendar-preferences.ui | 2 +
modules/calendar/e-memo-shell-view-actions.c | 2 +-
modules/calendar/e-memo-shell-view-private.c | 5 +-
modules/calendar/e-task-shell-view-private.c | 5 +-
modules/itip-formatter/e-mail-formatter-itip.c | 10 +-
modules/itip-formatter/e-mail-parser-itip.c | 6 +-
modules/itip-formatter/itip-view.c | 197 +-
modules/mail/e-mail-config-web-view.c | 3 +-
modules/mail/e-mail-shell-backend.c | 25 +-
modules/mail/e-mail-shell-view-actions.c | 6 +-
modules/mail/e-mail-shell-view-private.c | 26 +-
modules/mail/e-mail-shell-view.c | 9 +-
modules/mail/em-composer-prefs.c | 2 +-
modules/mail/em-mailer-prefs.c | 114 +-
modules/mail/em-network-prefs.c | 18 +-
modules/online-accounts/camel-sasl-xoauth.c | 4 +-
modules/plugin-lib/e-plugin-lib.c | 7 +-
modules/plugin-manager/evolution-plugin-manager.c | 2 +-
.../e-mail-display-popup-prefer-plain.c | 34 +-
modules/prefer-plain/e-mail-parser-prefer-plain.c | 30 +-
modules/prefer-plain/plugin/config-ui.c | 2 +-
modules/spamassassin/evolution-spamassassin.c | 2 +-
modules/startup-wizard/e-startup-assistant.c | 4 +-
.../e-mail-display-popup-text-highlight.c | 34 +-
.../e-mail-formatter-text-highlight.c | 13 +-
.../text-highlight/e-mail-parser-text-highlight.c | 8 +-
modules/text-highlight/languages.c | 243 +-
modules/text-highlight/languages.h | 2 +-
.../e-mail-parser-tnef-attachment.c | 450 +-
.../vcard-inline/e-mail-formatter-vcard-inline.c | 6 +-
modules/vcard-inline/e-mail-parser-vcard-inline.c | 2 +-
plugins/attachment-reminder/attachment-reminder.c | 2 +-
plugins/bbdb/bbdb.c | 2 +-
plugins/bbdb/gaimbuddies.c | 26 +-
plugins/dbx-import/dbx-importer.c | 32 +-
plugins/email-custom-header/email-custom-header.c | 4 +-
plugins/external-editor/external-editor.c | 12 +-
plugins/pst-import/pst-importer.c | 10 +-
plugins/publish-calendar/publish-calendar.c | 2 +-
plugins/publish-calendar/publish-location.c | 22 +-
plugins/save-calendar/csv-format.c | 12 +-
plugins/save-calendar/rdf-format.c | 12 +-
plugins/templates/templates.c | 6 +-
po/es.po | 1150 +-
po/gl.po | 366 +-
po/pa.po |22503 ++++++++++----------
po/sr.po | 1621 +-
po/sr latin po | 1621 +-
shell/e-shell-meego.c | 14 +-
shell/e-shell-settings.c | 14 +-
shell/e-shell-view.c | 6 +-
shell/e-shell-window-actions.c | 2 +-
shell/e-shell-window.c | 16 +-
shell/es-event.c | 2 +-
shell/main.c | 44 +-
smclient/eggsmclient-xsmp.c | 2 +-
smime/gui/ca-trust-dialog.c | 6 +-
smime/gui/cert-trust-dialog.c | 8 +-
smime/gui/certificate-manager.c | 6 +-
smime/gui/certificate-viewer.c | 4 +-
smime/gui/e-cert-selector.c | 14 +-
smime/lib/e-cert-db.c | 14 +-
smime/lib/e-cert.c | 20 +-
ui/evolution-calendars.ui | 1 +
ui/evolution-memos.ui | 1 +
ui/evolution-tasks.ui | 1 +
widgets/e-timezone-dialog/e-timezone-dialog.c | 4 +-
widgets/menus/gal-define-views-dialog.c | 2 +-
widgets/menus/gal-define-views-model.c | 2 +-
widgets/menus/gal-view-collection.c | 56 +-
widgets/menus/gal-view-instance.c | 6 +-
widgets/menus/gal-view-new-dialog.c | 10 +-
widgets/misc/e-attachment.c | 134 +-
widgets/misc/e-calendar-item.c | 6 +-
widgets/misc/e-canvas.c | 4 +-
widgets/misc/e-map.c | 4 +-
widgets/misc/e-preferences-window.c | 6 +-
widgets/misc/e-send-options.c | 2 +-
widgets/misc/e-spell-entry.c | 2 +-
widgets/misc/e-web-view.c | 2 +-
widgets/misc/ea-calendar-cell.c | 2 +-
widgets/misc/ea-calendar-item.c | 6 +-
widgets/misc/test-calendar.c | 4 +-
widgets/table/e-cell-combo.c | 8 +-
widgets/table/e-cell-hbox.c | 2 +-
widgets/table/e-cell-size.c | 2 +-
widgets/table/e-cell-text.c | 2 +-
widgets/table/e-popup-menu.c | 2 +-
widgets/table/e-table-column-specification.c | 34 +-
widgets/table/e-table-config.c | 10 +-
widgets/table/e-table-field-chooser-dialog.c | 2 +-
widgets/table/e-table-field-chooser-item.c | 4 +-
widgets/table/e-table-group-container.c | 14 +-
widgets/table/e-table-group-leaf.c | 2 +-
widgets/table/e-table-header-item.c | 16 +-
widgets/table/e-table-item.c | 70 +-
widgets/table/e-table-model.c | 4 +-
widgets/table/e-table-one.c | 2 +-
widgets/table/e-table-sort-info.c | 12 +-
widgets/table/e-table-sorted.c | 4 +-
widgets/table/e-table-sorter.c | 2 +-
widgets/table/e-table-specification.c | 16 +-
widgets/table/e-table-state.c | 6 +-
widgets/table/e-table-subset.c | 14 +-
widgets/table/e-table-utils.c | 4 +-
widgets/table/e-table.c | 4 +-
widgets/table/e-tree-model.c | 4 +-
widgets/table/e-tree-sorted.c | 30 +-
widgets/table/e-tree-table-adapter.c | 12 +-
widgets/table/e-tree.c | 4 +-
widgets/table/gal-a11y-e-cell-tree.c | 2 +-
widgets/table/gal-a11y-e-table-item.c | 8 +-
widgets/text/e-reflow-model.c | 6 +-
widgets/text/e-reflow.c | 6 +-
widgets/text/gal-a11y-e-text.c | 2 +-
299 files changed, 16984 insertions(+), 16516 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
