[evolution/express2: 22/22] Merge commit 'origin/gnome-2-30' into express2

[Michael Meeks <michael src gnome org>]

commit a84b1a325147e6321b90f491a1dc686e588869dc
Merge: e9c4388 ece7dcd
Author: Michael Meeks <michael meeks novell com>
Date:   Wed Apr 21 17:06:38 2010 +0100

    Merge commit 'origin/gnome-2-30' into express2

 calendar/gui/alarm-notify/Makefile.am              |   15 +-
 .../alarm-notify/evolution-alarm-notify-icon.rc    |    1 +
 .../gui/alarm-notify/evolution-alarm-notify.ico    |  Bin 0 -> 17542 bytes
 calendar/gui/e-cal-model.c                         |   15 +
 calendar/gui/e-cal-model.h                         |    3 +
 calendar/gui/e-day-view.c                          |   11 +-
 calendar/gui/e-week-view.c                         |   14 +-
 data/icons/Makefile.am                             |  147 +-
 ...ll.png => hicolor_actions_16x16_stock_bell.png} |  Bin 491 -> 491 bytes
 ...> hicolor_actions_16x16_stock_contact-list.png} |  Bin 450 -> 450 bytes
 ...=> hicolor_actions_16x16_stock_insert-note.png} |  Bin 265 -> 265 bytes
 ...lor_actions_16x16_stock_mail-filters-apply.png} |  Bin 475 -> 475 bytes
 ...ns_16x16_stock_mail-flag-for-followup-done.png} |  Bin 515 -> 515 bytes
 ...actions_16x16_stock_mail-flag-for-followup.png} |  Bin 562 -> 562 bytes
 ...lor_actions_16x16_stock_mail-open-multiple.png} |  Bin 661 -> 661 bytes
 ...r_actions_16x16_stock_mail-unread-multiple.png} |  Bin 553 -> 553 bytes
 ...lor_actions_16x16_stock_new-24h-appointment.png |  Bin 0 -> 780 bytes
 ...=> hicolor_actions_16x16_stock_new-meeting.png} |  Bin 827 -> 827 bytes
 data/icons/hicolor_actions_16x16_stock_notes.png   |  Bin 0 -> 534 bytes
 data/icons/hicolor_actions_16x16_stock_people.png  |  Bin 0 -> 764 bytes
 ...> hicolor_actions_16x16_stock_shared-by-me.png} |  Bin 777 -> 777 bytes
 ...> hicolor_actions_16x16_stock_shared-to-me.png} |  Bin 825 -> 825 bytes
 ...ng => hicolor_actions_16x16_stock_show-all.png} |  Bin 186 -> 186 bytes
 ...color_actions_16x16_stock_task-assigned-to.png} |  Bin 467 -> 467 bytes
 ... hicolor_actions_16x16_stock_task-assigned.png} |  Bin 482 -> 482 bytes
 ...hicolor_actions_16x16_stock_task-recurring.png} |  Bin 475 -> 475 bytes
 ...sk.png => hicolor_actions_16x16_stock_task.png} |  Bin 292 -> 292 bytes
 ...ng => hicolor_actions_16x16_stock_timezone.png} |  Bin 922 -> 922 bytes
 ...do.png => hicolor_actions_16x16_stock_todo.png} |  Bin 560 -> 560 bytes
 ...lor_actions_16x16_stock_video-conferencing.png} |  Bin 1090 -> 1090 bytes
 ...> hicolor_actions_16x16_stock_view-details.png} |  Bin 467 -> 467 bytes
 ...> hicolor_actions_24x24_stock_contact-list.png} |  Bin 899 -> 899 bytes
 ...=> hicolor_actions_24x24_stock_insert-note.png} |  Bin 1284 -> 1284 bytes
 ...lor_actions_24x24_stock_mail-filters-apply.png} |  Bin 849 -> 849 bytes
 ...lor_actions_24x24_stock_mail-open-multiple.png} |  Bin 1033 -> 1033 bytes
 ...r_actions_24x24_stock_mail-unread-multiple.png} |  Bin 813 -> 813 bytes
 ...lor_actions_24x24_stock_new-24h-appointment.png |  Bin 0 -> 1246 bytes
 ...=> hicolor_actions_24x24_stock_new-meeting.png} |  Bin 1801 -> 1801 bytes
 data/icons/hicolor_actions_24x24_stock_notes.png   |  Bin 0 -> 913 bytes
 data/icons/hicolor_actions_24x24_stock_people.png  |  Bin 0 -> 1499 bytes
 ...> hicolor_actions_24x24_stock_shared-by-me.png} |  Bin 1078 -> 1078 bytes
 ...> hicolor_actions_24x24_stock_shared-to-me.png} |  Bin 959 -> 959 bytes
 ...ng => hicolor_actions_24x24_stock_show-all.png} |  Bin 543 -> 543 bytes
 ...color_actions_24x24_stock_task-assigned-to.png} |  Bin 899 -> 899 bytes
 ... hicolor_actions_24x24_stock_task-assigned.png} |  Bin 907 -> 907 bytes
 ...hicolor_actions_24x24_stock_task-recurring.png} |  Bin 814 -> 814 bytes
 ...sk.png => hicolor_actions_24x24_stock_task.png} |  Bin 608 -> 608 bytes
 ...ng => hicolor_actions_24x24_stock_timezone.png} |  Bin 1124 -> 1124 bytes
 ...do.png => hicolor_actions_24x24_stock_todo.png} |  Bin 853 -> 853 bytes
 ...lor_actions_24x24_stock_video-conferencing.png} |  Bin 1724 -> 1724 bytes
 ...m.png => hicolor_actions_48x48_stock_alarm.png} |  Bin 5022 -> 5022 bytes
 ...ns_48x48_stock_mail-flag-for-followup-done.png} |  Bin 3273 -> 3273 bytes
 ...actions_48x48_stock_mail-flag-for-followup.png} |  Bin 3397 -> 3397 bytes
 ...lor_actions_48x48_stock_new-24h-appointment.png |  Bin 0 -> 3550 bytes
 ...=> hicolor_actions_48x48_stock_new-meeting.png} |  Bin 3766 -> 3766 bytes
 data/icons/hicolor_actions_48x48_stock_notes.png   |  Bin 0 -> 2454 bytes
 data/icons/hicolor_actions_48x48_stock_people.png  |  Bin 0 -> 3667 bytes
 ...ng => hicolor_actions_48x48_stock_timezone.png} |  Bin 2870 -> 2870 bytes
 ...do.png => hicolor_actions_48x48_stock_todo.png} |  Bin 2936 -> 2936 bytes
 ...=> hicolor_status_16x16_stock_check-filled.png} |  Bin 270 -> 270 bytes
 ...g => hicolor_status_16x16_stock_score-high.png} |  Bin 383 -> 383 bytes
 ...=> hicolor_status_16x16_stock_score-higher.png} |  Bin 381 -> 381 bytes
 ...> hicolor_status_16x16_stock_score-highest.png} |  Bin 376 -> 376 bytes
 ...ng => hicolor_status_16x16_stock_score-low.png} |  Bin 387 -> 387 bytes
 ... => hicolor_status_16x16_stock_score-lower.png} |  Bin 382 -> 382 bytes
 ...=> hicolor_status_16x16_stock_score-lowest.png} |  Bin 378 -> 378 bytes
 ...=> hicolor_status_16x16_stock_score-normal.png} |  Bin 343 -> 343 bytes
 ...> hicolor_status_16x16_stock_signature-bad.png} |  Bin 839 -> 839 bytes
 ...=> hicolor_status_16x16_stock_signature-ok.png} |  Bin 1110 -> 1110 bytes
 ...ng => hicolor_status_16x16_stock_signature.png} |  Bin 1108 -> 1108 bytes
 ...> hicolor_status_24x24_stock_signature-bad.png} |  Bin 1618 -> 1618 bytes
 ...=> hicolor_status_24x24_stock_signature-ok.png} |  Bin 1659 -> 1659 bytes
 ...ng => hicolor_status_24x24_stock_signature.png} |  Bin 1548 -> 1548 bytes
 ...> hicolor_status_48x48_stock_signature-bad.png} |  Bin 4764 -> 4764 bytes
 ...=> hicolor_status_48x48_stock_signature-ok.png} |  Bin 4273 -> 4273 bytes
 ...ng => hicolor_status_48x48_stock_signature.png} |  Bin 3730 -> 3730 bytes
 e-util/e-activity.c                                |    2 +-
 e-util/e-print.c                                   |   33 +-
 e-util/gconf-bridge.c                              |   36 +-
 help/de/de.po                                      |  398 +-
 mail/em-folder-tree.c                              |   89 +
 mail/em-folder-tree.h                              |    4 +
 mail/mail-mt.c                                     |    2 +-
 modules/calendar/e-cal-shell-view-private.c        |   85 +-
 modules/calendar/e-cal-shell-view-private.h        |    4 +
 modules/mail/e-mail-shell-view-private.c           |    1 +
 plugins/backup-restore/backup.c                    |    4 +-
 .../org-gnome-calendar-weather.eplug.xml           |    2 +-
 .../org-gnome-evolution-google.eplug.xml           |    2 +-
 po/ChangeLog                                       |    4 +
 po/bn_IN.po                                        |23831 ++++++++++---------
 po/th.po                                           |25735 +++++++++++---------
 po/zh_CN.po                                        | 5949 ++---
 shell/Makefile.am                                  |    4 +-
 shell/e-shell-window-private.c                     |   34 +-
 95 files changed, 29023 insertions(+), 27402 deletions(-)
---