[evolution/webkit-composer: 51/54] Merge branch 'master' into webkit-composer
- From: Dan VrÃtil <dvratil src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 51/54] Merge branch 'master' into webkit-composer
- Date: Tue, 7 Aug 2012 08:50:42 +0000 (UTC)
commit b0e80e21430ab0ed388f3840fad30e433566ff01
Merge: e5c4919 22098ef
Author: Dan VrÃtil <dvratil redhat com>
Date: Fri Aug 3 13:23:56 2012 +0200
Merge branch 'master' into webkit-composer
addressbook/gui/widgets/eab-contact-display.c | 11 +
addressbook/gui/widgets/eab-contact-formatter.c | 113 +-
addressbook/gui/widgets/eab-contact-formatter.h | 11 +
calendar/gui/e-cal-component-preview.c | 79 +-
composer/e-composer-private.c | 17 -
...ution.plugin.attachment-reminder.gschema.xml.in | 5 +-
data/webview.css | 10 -
e-util/e-system.error.xml | 40 +-
e-util/e-util.c | 34 +-
e-util/e-util.h | 2 +
em-format/e-mail-formatter-quote.c | 2 +-
em-format/e-mail-formatter-text-plain.c | 2 +-
em-format/e-mail-formatter.c | 12 +-
em-format/e-mail-formatter.h | 2 +
em-format/e-mail-parser-multipart-mixed.c | 14 +-
em-format/e-mail-parser-text-plain.c | 10 +-
help/C/default-browser.page | 28 +-
help/el/el.po |15846 +++++-----
libemail-engine/mail-ops.c | 59 -
libemail-engine/mail-ops.h | 2 -
mail/e-mail-config-assistant.c | 2 +-
mail/e-mail-config-window.c | 2 +-
mail/e-mail-display.c | 43 +-
mail/e-mail-label-list-store.c | 16 +-
mail/e-mail-printer.c | 25 +-
mail/e-mail-reader-utils.c | 7 +-
mail/e-mail-reader-utils.h | 1 +
mail/e-mail-reader.c | 5 +-
mail/e-mail-request.c | 26 +-
mail/e-mail-ui-session.c | 6 +-
mail/mail-send-recv.c | 28 +-
mail/mail.error.xml | 12 -
mail/message-list.c | 10 +-
modules/addressbook/e-book-shell-view-actions.c | 2 +-
modules/itip-formatter/e-mail-formatter-itip.c | 2 +-
modules/itip-formatter/itip-view.c | 13 +-
modules/itip-formatter/itip-view.h | 4 +-
modules/mail/e-mail-shell-view-private.c | 208 +-
.../e-mail-display-popup-prefer-plain.c | 20 +
modules/text-highlight/Makefile.am | 18 +-
.../e-mail-display-popup-text-highlight.c | 374 +
...ght.h => e-mail-display-popup-text-highlight.h} | 10 +-
...ghlight.c => e-mail-formatter-text-highlight.c} | 142 +-
...ghlight.h => e-mail-formatter-text-highlight.h} | 0
.../text-highlight/e-mail-parser-text-highlight.c | 159 +
...-highlight.h => e-mail-parser-text-highlight.h} | 10 +-
.../evolution-module-text-highlight.c | 7 +-
modules/text-highlight/languages.c | 529 +
.../{text-highlight.h => languages.h} | 25 +-
po/POTFILES.in | 4 +-
po/el.po |10073 ++++---
po/es.po | 657 +-
po/gl.po | 879 +-
po/gu.po |31600 ++++++++++----------
po/id.po |24881 ++++++++--------
po/lt.po |12447 ++++----
po/nb.po | 1113 +-
po/sr.po |18771 +++++-------
po/sr latin po |18771 +++++-------
po/zh_HK.po | 555 +-
po/zh_TW.po | 555 +-
widgets/misc/e-mail-signature-editor.c | 4 +-
widgets/misc/e-web-view.c | 14 +-
63 files changed, 68964 insertions(+), 69365 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]