[evolution/kill-bonobo: 1138/1140] Merge branch 'master' into kill-bonobo



commit 86fdd3a1cba7c156cfa127322e258f5636b45a99
Merge: c2119e5... 23df769...
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Apr 25 10:07:44 2009 -0400

    Merge branch 'master' into kill-bonobo
    
    This was a particularly messy merge.  Watch out for regressions!
    
    Conflicts:
    	ChangeLog
    	NEWS
    	a11y/ChangeLog
    	a11y/widgets/ea-combo-button.c
    	a11y/widgets/ea-combo-button.h
    	a11y/widgets/ea-widgets.c
    	addressbook/ChangeLog
    	addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
    	addressbook/gui/component/addressbook-component.c
    	addressbook/gui/component/addressbook-component.h
    	addressbook/gui/component/addressbook-config.c
    	addressbook/gui/component/addressbook-migrate.h
    	addressbook/gui/component/addressbook-view.c
    	addressbook/gui/component/addressbook-view.h
    	addressbook/gui/component/addressbook.h
    	addressbook/gui/component/autocompletion-config.c
    	addressbook/gui/component/autocompletion-config.h
    	addressbook/gui/component/component-factory.c
    	addressbook/gui/component/e-book-shell-module-migrate.c
    	addressbook/gui/component/ldap-config.glade
    	addressbook/gui/contact-editor/Makefile.am
    	addressbook/gui/contact-editor/contact-editor.glade
    	addressbook/gui/contact-editor/e-contact-editor-address.c
    	addressbook/gui/contact-editor/e-contact-editor-address.h
    	addressbook/gui/contact-editor/e-contact-editor-im.c
    	addressbook/gui/contact-editor/e-contact-editor-im.h
    	addressbook/gui/contact-editor/e-contact-editor.c
    	addressbook/gui/contact-editor/e-contact-editor.h
    	addressbook/gui/contact-editor/eab-editor.c
    	addressbook/gui/contact-editor/eab-editor.h
    	addressbook/gui/contact-editor/test-editor.c
    	addressbook/gui/contact-list-editor/Makefile.am
    	addressbook/gui/widgets/Makefile.am
    	addressbook/gui/widgets/e-addressbook-model.c
    	addressbook/gui/widgets/e-addressbook-model.h
    	addressbook/gui/widgets/e-addressbook-reflow-adapter.c
    	addressbook/gui/widgets/e-addressbook-view.c
    	addressbook/gui/widgets/e-addressbook-view.h
    	addressbook/gui/widgets/e-minicard-view.c
    	addressbook/gui/widgets/eab-contact-display.c
    	addressbook/gui/widgets/eab-gui-util.c
    	addressbook/gui/widgets/eab-menu.c
    	addressbook/gui/widgets/eab-menu.h
    	addressbook/gui/widgets/eab-popup-control.c
    	addressbook/gui/widgets/eab-popup-control.h
    	addressbook/gui/widgets/eab-popup.c
    	addressbook/gui/widgets/eab-popup.h
    	addressbook/gui/widgets/eab-vcard-control.c
    	addressbook/gui/widgets/eab-vcard-control.h
    	addressbook/gui/widgets/gal-view-minicard.c
    	addressbook/gui/widgets/gal-view-minicard.h
    	addressbook/printing/e-contact-print-style-editor.c
    	addressbook/printing/e-contact-print-style-editor.h
    	addressbook/printing/e-contact-print.glade
    	addressbook/printing/test-contact-print-style-editor.c
    	addressbook/tools/evolution-addressbook-export.c
    	addressbook/util/Makefile.am
    	calendar/ChangeLog
    	calendar/gui/Makefile.am
    	calendar/gui/apps_evolution_calendar.schemas.in
    	calendar/gui/calendar-component.c
    	calendar/gui/calendar-component.h
    	calendar/gui/calendar-config.c
    	calendar/gui/comp-editor-factory.c
    	calendar/gui/comp-editor-factory.h
    	calendar/gui/comp-util.c
    	calendar/gui/comp-util.h
    	calendar/gui/control-factory.c
    	calendar/gui/control-factory.h
    	calendar/gui/dialogs/alarm-dialog.c
    	calendar/gui/dialogs/cal-prefs-dialog.c
    	calendar/gui/dialogs/cal-prefs-dialog.glade
    	calendar/gui/dialogs/cal-prefs-dialog.h
    	calendar/gui/dialogs/comp-editor.c
    	calendar/gui/dialogs/comp-editor.h
    	calendar/gui/dialogs/event-editor.c
    	calendar/gui/dialogs/event-page.c
    	calendar/gui/dialogs/memo-editor.c
    	calendar/gui/dialogs/memo-page.c
    	calendar/gui/dialogs/recurrence-page.c
    	calendar/gui/dialogs/task-details-page.c
    	calendar/gui/dialogs/task-details-page.glade
    	calendar/gui/dialogs/task-editor.c
    	calendar/gui/dialogs/task-page.c
    	calendar/gui/e-cal-component-memo-preview.c
    	calendar/gui/e-cal-component-memo-preview.h
    	calendar/gui/e-cal-component-preview.c
    	calendar/gui/e-cal-component-preview.h
    	calendar/gui/e-cal-event.h
    	calendar/gui/e-cal-model.c
    	calendar/gui/e-cal-popup.c
    	calendar/gui/e-calendar-table.c
    	calendar/gui/e-calendar-view.c
    	calendar/gui/e-day-view.c
    	calendar/gui/e-itip-control.c
    	calendar/gui/e-memo-table.c
    	calendar/gui/e-memos.c
    	calendar/gui/e-memos.h
    	calendar/gui/e-tasks.c
    	calendar/gui/e-tasks.h
    	calendar/gui/e-week-view.c
    	calendar/gui/gnome-cal.c
    	calendar/gui/goto.c
    	calendar/gui/itip-bonobo-control.c
    	calendar/gui/itip-bonobo-control.h
    	calendar/gui/itip-utils.c
    	calendar/gui/itip-utils.h
    	calendar/gui/main.c
    	calendar/gui/memos-component.c
    	calendar/gui/memos-control.c
    	calendar/gui/memos-control.h
    	calendar/gui/migration.c
    	calendar/gui/migration.h
    	calendar/gui/tasks-component.c
    	calendar/gui/tasks-control.c
    	calendar/importers/main.c
    	composer/ChangeLog
    	composer/e-composer-actions.c
    	composer/e-composer-private.c
    	composer/e-msg-composer.c
    	composer/e-msg-composer.h
    	composer/evolution-composer.ui
    	configure.in
    	doc/reference/shell/eshell-overrides.txt
    	e-util/ChangeLog
    	e-util/Makefile.am
    	e-util/e-corba-utils.c
    	e-util/e-corba-utils.h
    	e-util/e-gui-utils.c
    	e-util/e-gui-utils.h
    	e-util/e-logger.c
    	e-util/e-non-intrusive-error-dialog.c
    	e-util/e-non-intrusive-error-dialog.h
    	e-util/e-plugin-ui.c
    	e-util/e-util-labels.c
    	e-util/e-util-labels.h
    	e-util/e-util.c
    	e-util/e-util.h
    	filter/ChangeLog
    	filter/filter-option.c
    	help/C/evolution.xml
    	help/ChangeLog
    	help/Makefile.am
    	help/cs/cs.po
    	help/de/de.po
    	help/es/es.po
    	help/eu/figures/Screenshot-Free-Busy.png
    	help/eu/figures/evo_blink.png
    	help/eu/figures/evo_dialog-info.png
    	help/eu/figures/evo_dialog-warning.png
    	help/eu/figures/evo_email_a.png
    	help/eu/figures/evo_flag_follow_up_a.png
    	help/eu/figures/evo_proxyadd_a.png
    	help/eu/figures/evo_shd_memo_a.png
    	help/eu/figures/exchange-delegation.png
    	help/eu/figures/exchange-identity.png
    	help/eu/figures/exchange-receive-options.png
    	help/eu/figures/exchange-receive.png
    	help/eu/figures/exchg-identity.png
    	help/eu/figures/exchng-identity.png
    	help/eu/figures/exchng-rec-mail.png
    	help/eu/figures/exchng-rec-option.png
    	help/eu/figures/exchng-rec-options.png
    	help/eu/figures/free_busy.png
    	help/eu/figures/full-1.png
    	help/eu/figures/full-2.png
    	help/eu/figures/full-3.png
    	help/eu/figures/full-4.png
    	help/eu/figures/full-5.png
    	help/eu/figures/full-6.png
    	help/eu/figures/full-7.png
    	help/eu/figures/mail-druid-pic.png
    	help/eu/figures/mail-inbox.png
    	help/eu/figures/mail-threaded.png
    	help/eu/figures/mainwindow-pic.png
    	help/eu/figures/minus.png
    	help/eu/figures/plus.png
    	help/eu/figures/proxy-cal.png
    	help/eu/figures/proxy-login.png
    	help/eu/figures/schedule.png
    	help/eu/figures/stock_search.png
    	help/eu/figures/sub-others-folder.png
    	help/eu/figures/sub-pub-fold.png
    	help/eu/figures/vfolder-createrule-fig.png
    	help/quickref/Makefile.am
    	mail/ChangeLog
    	mail/Makefile.am
    	mail/default/Makefile.am
    	mail/e-mail-shell-module-migrate.c
    	mail/e-searching-tokenizer.c
    	mail/em-account-editor.c
    	mail/em-account-prefs.h
    	mail/em-composer-prefs.c
    	mail/em-composer-prefs.h
    	mail/em-composer-utils.c
    	mail/em-filter-folder-element.c
    	mail/em-folder-browser.c
    	mail/em-folder-selection-button.h
    	mail/em-folder-selector.c
    	mail/em-folder-tree-model.c
    	mail/em-folder-tree-model.h
    	mail/em-folder-tree.c
    	mail/em-folder-tree.h
    	mail/em-folder-utils.c
    	mail/em-folder-utils.h
    	mail/em-folder-view.c
    	mail/em-format-html-display.c
    	mail/em-format-html-print.c
    	mail/em-format-html-print.h
    	mail/em-format-html.c
    	mail/em-format-quote.h
    	mail/em-format.c
    	mail/em-format.h
    	mail/em-html-stream.h
    	mail/em-mailer-prefs.c
    	mail/em-mailer-prefs.h
    	mail/em-message-browser.c
    	mail/em-message-browser.h
    	mail/em-migrate.h
    	mail/em-network-prefs.h
    	mail/em-popup.c
    	mail/em-search-context.h
    	mail/em-subscribe-editor.c
    	mail/em-utils.c
    	mail/em-utils.h
    	mail/filtertypes.xml
    	mail/mail-component-factory.c
    	mail/mail-component.c
    	mail/mail-config-factory.c
    	mail/mail-config-factory.h
    	mail/mail-config.c
    	mail/mail-config.glade
    	mail/mail-crypto.c
    	mail/mail-crypto.h
    	mail/mail-dialogs.glade
    	mail/mail-folder-cache.c
    	mail/mail-mt.c
    	mail/mail-send-recv.c
    	mail/mail-send-recv.h
    	mail/mail-session.c
    	mail/mail-session.h
    	mail/mail-types.h
    	mail/mail-vfolder.c
    	mail/message-list.c
    	mail/message-tag-followup.c
    	mail/searchtypes.xml
    	mail/vfoldertypes.xml
    	plugins/attachment-reminder/Makefile.am
    	plugins/audio-inline/org-gnome-audio-inline.eplug.xml
    	plugins/caldav/ChangeLog
    	plugins/caldav/caldav-source.c
    	plugins/calendar-http/ChangeLog
    	plugins/calendar-weather/ChangeLog
    	plugins/calendar-weather/calendar-weather.c
    	plugins/email-custom-header/ChangeLog
    	plugins/email-custom-header/email-custom-header.c
    	plugins/exchange-operations/ChangeLog
    	plugins/google-account-setup/ChangeLog
    	plugins/google-account-setup/Makefile.am
    	plugins/google-account-setup/google-contacts-source.c
    	plugins/google-account-setup/google-source.c
    	plugins/import-ics-attachments/ChangeLog
    	plugins/import-ics-attachments/Makefile.am
    	plugins/import-ics-attachments/icsimporter.c
    	plugins/itip-formatter/ChangeLog
    	plugins/itip-formatter/itip-view.c
    	plugins/mail-account-disable/ChangeLog
    	plugins/mail-account-disable/mail-account-disable.c
    	plugins/mail-notification/ChangeLog
    	plugins/mail-notification/mail-notification.c
    	plugins/mail-to-meeting/ChangeLog
    	plugins/mail-to-task/ChangeLog
    	plugins/mark-all-read/mark-all-read.c
    	plugins/publish-calendar/ChangeLog
    	plugins/publish-calendar/publish-format-fb.c
    	plugins/publish-calendar/publish-format-ical.c
    	plugins/save-attachments/ChangeLog
    	plugins/save-attachments/Makefile.am
    	plugins/save-attachments/save-attachments.c
    	plugins/select-one-source/ChangeLog
    	plugins/select-one-source/Makefile.am
    	plugins/select-one-source/select-one-source.c
    	plugins/startup-wizard/ChangeLog
    	plugins/startup-wizard/startup-wizard.c
    	plugins/webdav-account-setup/ChangeLog
    	plugins/webdav-account-setup/Makefile.am
    	plugins/webdav-account-setup/webdav-contacts-source.c
    	po/ChangeLog
    	po/POTFILES.in
    	po/ar.po
    	po/bg.po
    	po/bn_IN.po
    	po/ca.po
    	po/cs.po
    	po/da.po
    	po/de.po
    	po/el.po
    	po/en_GB.po
    	po/es.po
    	po/et.po
    	po/fr.po
    	po/gl.po
    	po/gu.po
    	po/hi.po
    	po/hu.po
    	po/it.po
    	po/ja.po
    	po/kn.po
    	po/ko.po
    	po/lt.po
    	po/ml.po
    	po/mr.po
    	po/nb.po
    	po/nl.po
    	po/pa.po
    	po/pl.po
    	po/pt.po
    	po/ru.po
    	po/sl.po
    	po/sr.po
    	po/sr latin po
    	po/sv.po
    	po/ta.po
    	po/te.po
    	po/th.po
    	po/tr.po
    	po/zh_HK.po
    	po/zh_TW.po
    	shell/ChangeLog
    	shell/Evolution-Component.idl
    	shell/Makefile.am
    	shell/apps_evolution_shell.schemas.in
    	shell/e-component-registry.c
    	shell/e-component-registry.h
    	shell/e-component-view.c
    	shell/e-component-view.h
    	shell/e-corba-config-page.c
    	shell/e-corba-config-page.h
    	shell/e-shell-constants.h
    	shell/e-shell-importer.c
    	shell/e-shell-importer.h
    	shell/e-shell-nm.c
    	shell/e-shell-settings-dialog.c
    	shell/e-shell-settings-dialog.h
    	shell/e-shell-view.c
    	shell/e-shell-view.h
    	shell/e-shell-window-commands.c
    	shell/e-shell-window-commands.h
    	shell/e-shell-window.c
    	shell/e-shell-window.h
    	shell/e-shell.c
    	shell/e-shell.h
    	shell/e-sidebar.c
    	shell/e-sidebar.h
    	shell/e-user-creatable-items-handler.c
    	shell/e-user-creatable-items-handler.h
    	shell/es-menu.c
    	shell/es-menu.h
    	shell/evolution-component.c
    	shell/evolution-component.h
    	shell/evolution-config-control.c
    	shell/evolution-config-control.h
    	shell/evolution-listener.c
    	shell/evolution-listener.h
    	shell/evolution-shell-component-utils.c
    	shell/evolution-shell-component-utils.h
    	shell/importer/evolution-importer-client.c
    	shell/importer/evolution-importer-client.h
    	shell/importer/evolution-importer-listener.c
    	shell/importer/evolution-importer-listener.h
    	shell/importer/evolution-importer.c
    	shell/importer/evolution-importer.h
    	shell/importer/evolution-intelligent-importer.c
    	shell/importer/evolution-intelligent-importer.h
    	shell/importer/import.glade
    	shell/importer/intelligent.c
    	shell/importer/intelligent.h
    	shell/main.c
    	shell/shell.error.xml
    	shell/test/evolution-test-component.c
    	shell/test/evolution-test-component.h
    	smime/ChangeLog
    	smime/lib/Makefile.am
    	ui/Makefile.am
    	ui/evolution-addressbook.xml
    	ui/evolution-calendar.xml
    	widgets/ChangeLog
    	widgets/menus/gal-view-menus.c
    	widgets/menus/gal-view-menus.h
    	widgets/misc/ChangeLog
    	widgets/misc/Makefile.am
    	widgets/misc/e-activity-handler.c
    	widgets/misc/e-activity-handler.h
    	widgets/misc/e-attachment-bar.c
    	widgets/misc/e-attachment-bar.h
    	widgets/misc/e-attachment.c
    	widgets/misc/e-attachment.h
    	widgets/misc/e-calendar-item.c
    	widgets/misc/e-charset-picker.c
    	widgets/misc/e-combo-button.c
    	widgets/misc/e-combo-button.h
    	widgets/misc/e-config-page.c
    	widgets/misc/e-config-page.h
    	widgets/misc/e-dropdown-button.c
    	widgets/misc/e-dropdown-button.h
    	widgets/misc/e-filter-bar.h
    	widgets/misc/e-info-label.c
    	widgets/misc/e-info-label.h
    	widgets/misc/e-multi-config-dialog.c
    	widgets/misc/e-multi-config-dialog.h
    	widgets/misc/e-online-button.c
    	widgets/misc/e-search-bar.c
    	widgets/misc/e-search-bar.h
    	widgets/misc/e-signature-combo-box.c
    	widgets/misc/e-signature-combo-box.h
    	widgets/misc/e-signature-editor.c
    	widgets/misc/e-signature-editor.h
    	widgets/misc/e-task-bar.c
    	widgets/misc/e-task-bar.h
    	widgets/misc/e-task-widget.c
    	widgets/misc/e-task-widget.h
    	widgets/misc/test-dropdown-button.c
    	widgets/misc/test-info-label.c
    	widgets/misc/test-multi-config-dialog.c
    	widgets/table/ChangeLog
    	widgets/table/e-cell-date.c
    	widgets/table/e-table-group-container.c
    	widgets/table/e-table-group-leaf.c
    	widgets/table/e-table-group.c
    	widgets/table/e-table-group.h
    	widgets/table/e-table.c
    	widgets/table/e-table.h

 ChangeLog                                          |   27 +
 MAINTAINERS                                        |    7 +-
 NEWS                                               |   87 +
 a11y/ChangeLog                                     |    5 +
 a11y/e-table/gal-a11y-e-cell-tree.c                |    4 +-
 addressbook/ChangeLog                              |   42 +
 addressbook/conduit/address-conduit.c              |   24 +-
 addressbook/gui/component/addressbook-config.c     |   80 +-
 .../gui/component/e-book-shell-module-migrate.c    |    8 +-
 addressbook/gui/component/ldap-config.glade        | 1731 +--
 addressbook/gui/contact-editor/Makefile.am         |    8 -
 .../gui/contact-editor/contact-editor.glade        |  979 +-
 .../gui/contact-editor/e-contact-editor-address.c  |  624 -
 .../gui/contact-editor/e-contact-editor-address.h  |   74 -
 .../gui/contact-editor/e-contact-editor-fullname.c |   36 +-
 .../gui/contact-editor/e-contact-editor-im.c       |  513 -
 .../gui/contact-editor/e-contact-editor-im.h       |   79 -
 addressbook/gui/contact-editor/e-contact-editor.c  |  370 +-
 addressbook/gui/contact-editor/fulladdr.glade      |  446 -
 addressbook/gui/contact-editor/fullname.glade      |  485 +-
 addressbook/gui/contact-editor/im.glade            |  206 -
 addressbook/gui/contact-list-editor/Makefile.am    |    2 -
 addressbook/gui/widgets/Makefile.am                |    2 -
 addressbook/gui/widgets/e-minicard-view.c          |    7 +
 addressbook/printing/Makefile.am                   |   15 +-
 .../printing/e-contact-print-style-editor.c        |  123 -
 .../printing/e-contact-print-style-editor.h        |   75 -
 addressbook/printing/e-contact-print.glade         | 2018 --
 .../printing/test-contact-print-style-editor.c     |   58 -
 addressbook/util/Makefile.am                       |    2 -
 calendar/ChangeLog                                 |  239 +
 calendar/gui/alarm-notify/alarm-notify.c           |    2 +
 calendar/gui/alarm-notify/alarm-queue.c            |    8 +-
 calendar/gui/apps_evolution_calendar.schemas.in    |   24 +-
 calendar/gui/calendar-component.c                  |  152 +-
 calendar/gui/calendar-config-keys.h                |    2 +-
 calendar/gui/calendar-config.c                     |  148 +-
 calendar/gui/calendar-config.h                     |   19 +-
 calendar/gui/comp-util.c                           |   59 +
 calendar/gui/comp-util.h                           |    1 +
 calendar/gui/dialogs/Makefile.am                   |    1 -
 calendar/gui/dialogs/alarm-dialog.c                |  157 +-
 calendar/gui/dialogs/alarm-dialog.glade            |  182 +-
 calendar/gui/dialogs/cal-prefs-dialog.c            |   62 +-
 calendar/gui/dialogs/cal-prefs-dialog.glade        |  184 +-
 calendar/gui/dialogs/cal-prefs-dialog.h            |    3 +-
 calendar/gui/dialogs/comp-editor.c                 |   32 +-
 calendar/gui/dialogs/event-editor.c                |    6 +-
 calendar/gui/dialogs/event-page.c                  |  143 +-
 calendar/gui/dialogs/event-page.glade              |  108 +-
 calendar/gui/dialogs/meeting-page.glade            |  407 -
 calendar/gui/dialogs/memo-page.c                   |   34 +-
 calendar/gui/dialogs/memo-page.glade               |   59 +-
 calendar/gui/dialogs/recurrence-page.c             |  326 +-
 calendar/gui/dialogs/recurrence-page.glade         |  141 +-
 calendar/gui/dialogs/task-details-page.c           |   44 +-
 calendar/gui/dialogs/task-page.c                   |   42 +-
 calendar/gui/dialogs/task-page.glade               |   33 +-
 calendar/gui/e-cal-component-preview.c             |    8 +
 calendar/gui/e-cal-model.c                         |    1 +
 calendar/gui/e-cal-popup.c                         |   18 +-
 calendar/gui/e-calendar-table.h                    |    2 +
 calendar/gui/e-calendar-view.c                     |  189 +-
 calendar/gui/e-calendar-view.h                     |    4 +
 calendar/gui/e-day-view.c                          |   88 +-
 calendar/gui/e-itip-control.c                      |  146 +-
 calendar/gui/e-meeting-list-view.c                 |    1 +
 calendar/gui/e-meeting-time-sel.c                  |    5 +-
 calendar/gui/e-memo-table.c                        |   12 +
 calendar/gui/e-memos.h                             |    1 +
 calendar/gui/e-tasks.c                             |    1 -
 calendar/gui/e-week-view.c                         |   20 +-
 calendar/gui/gnome-cal.c                           |   63 +-
 calendar/gui/goto-dialog.glade                     |  129 +-
 calendar/gui/goto.c                                |   19 +-
 calendar/gui/itip-utils.c                          |    6 +-
 calendar/gui/itip-utils.h                          |    2 +-
 calendar/gui/memos-component.c                     |   28 +-
 calendar/gui/tasks-control.c                       |   24 +-
 calendar/gui/weekday-picker.c                      |    3 -
 composer/ChangeLog                                 |   17 +
 composer/e-composer-private.h                      |    2 +
 composer/e-msg-composer.h                          |    5 +
 configure.in                                       |    8 +-
 e-util/ChangeLog                                   |   18 +
 e-util/e-config.c                                  |    6 +-
 e-util/e-cursor.c                                  |    4 +-
 e-util/e-dialog-utils.c                            |    8 +-
 e-util/e-dialog-widgets.c                          |  109 -
 e-util/e-dialog-widgets.h                          |    3 -
 e-util/e-logger.c                                  |    2 +-
 e-util/gconf-bridge.c                              |    1 +
 evolution.doap                                     |   46 +
 filter/ChangeLog                                   |   10 +
 filter/filter-datespec.c                           |   49 +-
 filter/filter-option.c                             |   57 +-
 filter/filter-rule.c                               |   80 +-
 filter/filter.glade                                |  171 +-
 help/C/evolution.xml                               |  219 +-
 help/C/figures/evo_Wcal_prop_a.png                 |  Bin 0 -> 18687 bytes
 help/C/figures/evo_caltasks_a.png                  |  Bin 0 -> 83180 bytes
 help/C/figures/evo_exchng_mapi.png                 |  Bin 0 -> 26452 bytes
 help/C/figures/evo_import.png                      |  Bin 0 -> 26432 bytes
 help/ChangeLog                                     |  161 +
 help/Makefile.am                                   |    6 +-
 help/cs/cs.po                                      | 7398 ++++---
 help/de/de.po                                      | 5794 +++---
 help/el/el.po                                      |11748 +++++-----
 help/en_GB/en_GB.po                                |17936 +++++++++++-----
 help/es/es.po                                      | 5494 +++---
 help/es/figures/evo_Wcal_prop_a.png                |  Bin 0 -> 23867 bytes
 help/es/figures/evo_caltasks_a.png                 |  Bin 0 -> 74186 bytes
 help/es/figures/evo_custom_header.png              |  Bin 0 -> 26444 bytes
 help/es/figures/evo_exchng_mapi.png                |  Bin 0 -> 38257 bytes
 help/es/figures/evo_import.png                     |  Bin 0 -> 26185 bytes
 help/es/figures/evo_mail_callout_a.png             |  Bin 0 -> 80654 bytes
 help/eu/eu.po                                      | 9303 ++++++++
 help/eu/figures/Screenshot-Free-Busy.png           |  Bin 0 -> 31494 bytes
 help/eu/figures/account_editor_a.png               |  Bin 0 -> 50551 bytes
 help/eu/figures/addrs_book_a.png                   |  Bin 0 -> 15466 bytes
 help/eu/figures/attach_reminder_a.png.png          |  Bin 0 -> 16354 bytes
 help/eu/figures/calendar.png                       |  Bin 0 -> 91038 bytes
 help/eu/figures/categories_a.png                   |  Bin 0 -> 44028 bytes
 help/eu/figures/collap_head_a.png                  |  Bin 0 -> 12783 bytes
 help/eu/figures/config-cal.png                     |  Bin 0 -> 53918 bytes
 help/eu/figures/config-mail.png                    |  Bin 0 -> 74138 bytes
 help/eu/figures/contact-editor.png                 |  Bin 0 -> 71099 bytes
 help/eu/figures/contact.png                        |  Bin 0 -> 105365 bytes
 help/eu/figures/contacts_mainwindow_a.png          |  Bin 0 -> 68465 bytes
 help/eu/figures/delgt-add.png                      |  Bin 0 -> 11936 bytes
 help/eu/figures/evo_account_editor_a.png           |  Bin 0 -> 37327 bytes
 help/eu/figures/evo_account_info_a.png             |  Bin 0 -> 20688 bytes
 help/eu/figures/evo_add_rule_a.png                 |  Bin 0 -> 29102 bytes
 help/eu/figures/evo_adv_search_a.png               |  Bin 0 -> 40530 bytes
 help/eu/figures/evo_allday_a.png                   |  Bin 0 -> 85046 bytes
 help/eu/figures/evo_attachreminder_plugin.png      |  Bin 0 -> 50087 bytes
 help/eu/figures/evo_backup.png                     |  Bin 0 -> 16985 bytes
 help/eu/figures/evo_backup_prgsbar.png             |  Bin 0 -> 12989 bytes
 help/eu/figures/evo_backup_warning.png             |  Bin 0 -> 21903 bytes
 help/eu/figures/evo_blink.png                      |  Bin 0 -> 634 bytes
 help/eu/figures/evo_cal_a.png                      |  Bin 0 -> 88911 bytes
 help/eu/figures/evo_cal_advsearch.png              |  Bin 0 -> 22957 bytes
 help/eu/figures/evo_cal_callout_a.png              |  Bin 0 -> 104045 bytes
 help/eu/figures/evo_cal_prop_a.png                 |  Bin 0 -> 15752 bytes
 help/eu/figures/evo_calender_appointmnt.png        |  Bin 0 -> 36827 bytes
 help/eu/figures/evo_calstatus_a.png                |  Bin 0 -> 23863 bytes
 help/eu/figures/evo_contacteditor_a.png            |  Bin 0 -> 71099 bytes
 help/eu/figures/evo_crash_recovery.png             |  Bin 0 -> 11624 bytes
 help/eu/figures/evo_custom_header.png              |  Bin 0 -> 14824 bytes
 help/eu/figures/evo_debuglogs_a.png                |  Bin 0 -> 13229 bytes
 help/eu/figures/evo_delegate_permission_a.png      |  Bin 0 -> 15004 bytes
 help/eu/figures/evo_dialog-info.png                |  Bin 0 -> 1188 bytes
 help/eu/figures/evo_dialog-warning.png             |  Bin 0 -> 966 bytes
 help/eu/figures/evo_edit_rule_a.png                |  Bin 0 -> 26829 bytes
 help/eu/figures/evo_edit_search.png                |  Bin 0 -> 24046 bytes
 help/eu/figures/evo_email_a.png                    |  Bin 0 -> 87620 bytes
 help/eu/figures/evo_flag_follow_up_a.png           |  Bin 0 -> 24639 bytes
 help/eu/figures/evo_gwreceive_a.png                |  Bin 0 -> 27232 bytes
 help/eu/figures/evo_gwreceiveedit_a.png            |  Bin 0 -> 38326 bytes
 help/eu/figures/evo_gwreceiveoptedit_a.png         |  Bin 0 -> 27582 bytes
 help/eu/figures/evo_gwstatustrack.png              |  Bin 0 -> 22429 bytes
 help/eu/figures/evo_identity_a.png                 |  Bin 0 -> 31029 bytes
 help/eu/figures/evo_identityedit_a.png             |  Bin 0 -> 35829 bytes
 help/eu/figures/evo_imapheader_a.png               |  Bin 0 -> 40839 bytes
 help/eu/figures/evo_imapreceive_a.png              |  Bin 0 -> 46379 bytes
 help/eu/figures/evo_import_asst_a.png              |  Bin 0 -> 22671 bytes
 help/eu/figures/evo_junk_a.png                     |  Bin 0 -> 46276 bytes
 help/eu/figures/evo_label_a.png                    |  Bin 0 -> 29394 bytes
 help/eu/figures/evo_labels_a.png                   |  Bin 0 -> 26098 bytes
 help/eu/figures/evo_mail_a.png                     |  Bin 0 -> 132099 bytes
 help/eu/figures/evo_mail_callout_a.png             |  Bin 0 -> 125489 bytes
 help/eu/figures/evo_mail_notifier.png              |  Bin 0 -> 4452 bytes
 help/eu/figures/evo_maildirreceive_a.png           |  Bin 0 -> 23553 bytes
 help/eu/figures/evo_mboxreceive_a.png              |  Bin 0 -> 25782 bytes
 help/eu/figures/evo_memo_a.png                     |  Bin 0 -> 21671 bytes
 help/eu/figures/evo_mereceive_a.png                |  Bin 0 -> 42871 bytes
 help/eu/figures/evo_message_filters_a.png          |  Bin 0 -> 24642 bytes
 help/eu/figures/evo_mhreceive_a.png                |  Bin 0 -> 23843 bytes
 help/eu/figures/evo_newmail.png                    |  Bin 0 -> 6436 bytes
 help/eu/figures/evo_newmess_a.png                  |  Bin 0 -> 37793 bytes
 help/eu/figures/evo_offline.png                    |  Bin 0 -> 18667 bytes
 help/eu/figures/evo_popreceive_a.png               |  Bin 0 -> 28368 bytes
 help/eu/figures/evo_proxyadd_a.png                 |  Bin 0 -> 15425 bytes
 help/eu/figures/evo_receive_setup2_a.png           |  Bin 0 -> 37836 bytes
 help/eu/figures/evo_receive_setup_a.png            |  Bin 0 -> 38263 bytes
 help/eu/figures/evo_rmdrnotes_a.png                |  Bin 0 -> 107111 bytes
 help/eu/figures/evo_rule_a.png                     |  Bin 0 -> 51870 bytes
 help/eu/figures/evo_select_add_folder.png          |  Bin 0 -> 20383 bytes
 help/eu/figures/evo_select_folder.png              |  Bin 0 -> 22087 bytes
 help/eu/figures/evo_send_option_a.png              |  Bin 0 -> 18118 bytes
 help/eu/figures/evo_send_setup_a.png               |  Bin 0 -> 45379 bytes
 help/eu/figures/evo_sendstatus_a.png               |  Bin 0 -> 24511 bytes
 help/eu/figures/evo_shd_memo_a.png                 |  Bin 0 -> 25762 bytes
 help/eu/figures/evo_timezone_a.png                 |  Bin 0 -> 151835 bytes
 help/eu/figures/evo_usereceive_a.png               |  Bin 0 -> 26189 bytes
 help/eu/figures/exchange-delegation.png            |  Bin 0 -> 62447 bytes
 help/eu/figures/exchange-identity.png              |  Bin 0 -> 29201 bytes
 help/eu/figures/exchange-receive-options.png       |  Bin 0 -> 31765 bytes
 help/eu/figures/exchange-receive.png               |  Bin 0 -> 31500 bytes
 help/eu/figures/exchg-identity.png                 |  Bin 0 -> 33009 bytes
 help/eu/figures/exchng-identity.png                |  Bin 0 -> 28260 bytes
 help/eu/figures/exchng-rec-mail.png                |  Bin 0 -> 29723 bytes
 help/eu/figures/exchng-rec-mails.png               |  Bin 0 -> 25455 bytes
 help/eu/figures/exchng-rec-option.png              |  Bin 0 -> 38511 bytes
 help/eu/figures/exchng-rec-options.png             |  Bin 0 -> 45452 bytes
 help/eu/figures/exchng-settings.png                |  Bin 0 -> 27963 bytes
 help/eu/figures/filter-new-fig.png                 |  Bin 0 -> 29047 bytes
 help/eu/figures/free_busy.png                      |  Bin 0 -> 72774 bytes
 help/eu/figures/full-1.png                         |  Bin 0 -> 1218 bytes
 help/eu/figures/full-2.png                         |  Bin 0 -> 1260 bytes
 help/eu/figures/full-3.png                         |  Bin 0 -> 1290 bytes
 help/eu/figures/full-4.png                         |  Bin 0 -> 1251 bytes
 help/eu/figures/full-5.png                         |  Bin 0 -> 1293 bytes
 help/eu/figures/full-6.png                         |  Bin 0 -> 1284 bytes
 help/eu/figures/full-7.png                         |  Bin 0 -> 818 bytes
 help/eu/figures/google_cal_view.png                |  Bin 0 -> 25723 bytes
 help/eu/figures/mail-druid-pic.png                 |  Bin 0 -> 32267 bytes
 help/eu/figures/mail-inbox.png                     |  Bin 0 -> 95031 bytes
 help/eu/figures/mail-threaded.png                  |  Bin 0 -> 7093 bytes
 help/eu/figures/mail_mainwindow_a.png              |  Bin 0 -> 149754 bytes
 help/eu/figures/mailer_preferences.png             |  Bin 0 -> 83311 bytes
 help/eu/figures/mainwindow-pic.png                 |  Bin 0 -> 101231 bytes
 help/eu/figures/minus.png                          |  Bin 0 -> 344 bytes
 help/eu/figures/newmsg.png                         |  Bin 0 -> 56766 bytes
 help/eu/figures/plus.png                           |  Bin 0 -> 406 bytes
 help/eu/figures/proxy-cal.png                      |  Bin 0 -> 43906 bytes
 help/eu/figures/proxy-login.png                    |  Bin 0 -> 12305 bytes
 help/eu/figures/quick_add_a.png                    |  Bin 0 -> 15794 bytes
 help/eu/figures/quick_reference.png                |  Bin 0 -> 51534 bytes
 help/eu/figures/replymsg.png                       |  Bin 0 -> 65452 bytes
 help/eu/figures/schedule.png                       |  Bin 0 -> 44752 bytes
 help/eu/figures/stock_search.png                   |  Bin 0 -> 1014 bytes
 help/eu/figures/sub-others-folder.png              |  Bin 0 -> 10399 bytes
 help/eu/figures/sub-pub-fold.png                   |  Bin 0 -> 32967 bytes
 help/eu/figures/ver_view_a.png                     |  Bin 0 -> 152123 bytes
 help/eu/figures/vfolder-createrule-fig.png         |  Bin 0 -> 35099 bytes
 help/quickref/Makefile.am                          |    2 +-
 help/quickref/ca/Makefile.am                       |    8 +
 help/quickref/ca/quickref.pdf                      |  Bin 0 -> 35218 bytes
 help/quickref/ca/quickref.tex                      |  116 +
 help/sv/sv.po                                      | 9344 +++++----
 mail/ChangeLog                                     |  155 +
 mail/default/Makefile.am                           |    2 +-
 mail/default/ca/Inbox                              |  317 +
 mail/default/ca/Makefile.am                        |    7 +
 mail/em-composer-prefs.h                           |    5 +-
 mail/em-filter-editor.c                            |   44 +-
 mail/em-filter-rule.c                              |   53 +-
 mail/em-filter-source-element.c                    |   40 +-
 mail/em-folder-browser.c                           |    8 +
 mail/em-folder-selector.c                          |    2 +-
 mail/em-folder-tree.c                              |    3 +-
 mail/em-folder-utils.c                             |   18 +-
 mail/em-mailer-prefs.h                             |   11 +-
 mail/em-subscribe-editor.c                         |   88 +-
 mail/em-utils.c                                    |   48 +-
 mail/mail-config.c                                 |  146 +-
 mail/mail-folder-cache.c                           |   29 +
 mail/mail-folder-cache.h                           |    1 +
 mail/mail-mt.c                                     |    4 +-
 mail/mail-ops.c                                    |   18 +-
 mail/mail-session.c                                |    6 +
 mail/message-list.c                                |   30 +-
 mail/message-tag-followup.c                        |   20 +-
 mail/message-tag-followup.h                        |    2 +-
 plugins/attachment-reminder/Makefile.am            |    2 +-
 plugins/caldav/ChangeLog                           |   13 +
 plugins/caldav/Makefile.am                         |    4 +-
 plugins/caldav/caldav-source.c                     |   54 +-
 plugins/calendar-http/ChangeLog                    |    6 +
 plugins/calendar-http/calendar-http.c              |   56 +-
 plugins/calendar-weather/ChangeLog                 |    6 +
 plugins/calendar-weather/calendar-weather.c        |  102 +-
 plugins/email-custom-header/ChangeLog              |    7 +
 plugins/email-custom-header/email-custom-header.c  |   13 +-
 plugins/exchange-operations/ChangeLog              |   15 +
 .../e-foreign-folder-dialog.glade                  |  460 +-
 .../exchange-operations/exchange-delegates-user.c  |   38 +-
 .../exchange-operations/exchange-delegates.glade   |  208 +-
 .../exchange-folder-subscription.c                 |   40 +-
 .../exchange-permissions-dialog.c                  |    5 -
 plugins/google-account-setup/ChangeLog             |   36 +
 plugins/google-account-setup/Makefile.am           |    6 +-
 .../google-account-setup/google-contacts-source.c  |   24 +-
 plugins/google-account-setup/google-source.c       |   65 +-
 plugins/itip-formatter/ChangeLog                   |    6 +
 plugins/itip-formatter/itip-view.c                 |    1 +
 plugins/mail-notification/ChangeLog                |    8 +
 plugins/mail-notification/mail-notification.c      |    6 +-
 plugins/mail-to-meeting/ChangeLog                  |    6 +
 plugins/mail-to-meeting/mail-to-meeting.c          |    4 +-
 plugins/mail-to-task/ChangeLog                     |    6 +
 plugins/mail-to-task/mail-to-task.c                |   10 +-
 plugins/publish-calendar/ChangeLog                 |   15 +
 plugins/publish-calendar/publish-calendar.c        |  166 +-
 plugins/publish-calendar/publish-format-fb.c       |   29 +-
 plugins/publish-calendar/publish-format-fb.h       |    2 +-
 plugins/publish-calendar/publish-format-ical.c     |   27 +-
 plugins/publish-calendar/publish-format-ical.h     |    2 +-
 plugins/startup-wizard/ChangeLog                   |    9 +
 .../org-gnome-evolution-startup-wizard.eplug.xml   |    1 -
 plugins/startup-wizard/startup-wizard.c            |   60 +-
 plugins/webdav-account-setup/ChangeLog             |   15 +
 plugins/webdav-account-setup/Makefile.am           |    6 +-
 .../webdav-account-setup/webdav-contacts-source.c  |   17 +-
 po/ChangeLog                                       | 1622 +--
 po/LINGUAS                                         |    2 +
 po/POTFILES.in                                     |    2 +
 po/af.po                                           |23350 ++++++++++++++++++++
 po/ar.po                                           | 7700 ++++---
 po/as.po                                           |17917 +++++++--------
 po/be.po                                           |19177 ++++++++++------
 po/be latin po                                     |12104 ++++++-----
 po/bg.po                                           | 7103 +++---
 po/bn_IN.po                                        | 7558 ++++---
 po/ca.po                                           | 1125 +-
 po/cs.po                                           | 6114 +++---
 po/da.po                                           | 6041 +++---
 po/de.po                                           | 1752 +-
 po/el.po                                           | 7523 ++++----
 po/en_GB.po                                        | 7711 ++++---
 po/es.po                                           |  938 +-
 po/et.po                                           |  870 +-
 po/fr.po                                           | 6621 +++---
 po/gl.po                                           |10255 +++++----
 po/gu.po                                           | 1426 +-
 po/hi.po                                           |10536 +++++-----
 po/hu.po                                           |    4 +-
 po/it.po                                           | 8788 ++++----
 po/ja.po                                           | 8920 ++++----
 po/kn.po                                           |10476 +++++----
 po/ko.po                                           | 1340 +-
 po/lt.po                                           | 7892 ++++----
 po/mai.po                                          |23114 +++++++++++++++++++
 po/ml.po                                           |10960 +++++-----
 po/mr.po                                           | 9170 ++++----
 po/nb.po                                           |  865 +-
 po/nl.po                                           | 7166 ++++---
 po/or.po                                           |18709 +++++++++-------
 po/pa.po                                           | 2702 +--
 po/pl.po                                           | 8032 +++----
 po/pt.po                                           | 7830 ++++---
 po/ro.po                                           |18123 +++++++++-------
 po/ru.po                                           | 2362 ++-
 po/sl.po                                           | 4874 +++--
 po/sr.po                                           | 1567 +-
 po/sr latin po                                     | 1567 +-
 po/sv.po                                           | 1383 +-
 po/ta.po                                           | 1933 +-
 po/te.po                                           | 7838 ++++----
 po/th.po                                           | 6592 +++---
 po/tr.po                                           | 7685 ++++---
 po/uk.po                                           |11229 +++++-----
 po/zh_HK.po                                        |  571 +-
 po/zh_TW.po                                        |  576 +-
 shell/ChangeLog                                    |   18 +
 shell/e-shell-importer.c                           |  111 +-
 smime/ChangeLog                                    |   31 +
 smime/gui/certificate-manager.c                    |   40 +-
 smime/gui/e-cert-selector.c                        |   21 +-
 smime/gui/smime-ui.glade                           |  247 +-
 smime/lib/Makefile.am                              |    2 -
 smime/lib/e-cert-db.c                              |    2 -
 widgets/ChangeLog                                  |   22 +
 widgets/misc/ChangeLog                             |   41 +
 widgets/misc/e-calendar-item.c                     |   37 +-
 widgets/misc/e-canvas.c                            |    2 +-
 widgets/misc/e-cell-date-edit.c                    |  116 +-
 widgets/misc/e-cell-date-edit.h                    |    2 +-
 widgets/misc/e-dateedit.c                          |    8 +-
 widgets/misc/e-filter-bar.c                        |    4 +-
 widgets/table/ChangeLog                            |   48 +
 widgets/table/e-cell-combo.c                       |  173 +-
 widgets/table/e-cell-combo.h                       |    2 +-
 widgets/table/e-cell-date.c                        |    3 +-
 widgets/table/e-cell-text.c                        |    7 +-
 widgets/table/e-table-example-1.c                  |    1 -
 widgets/table/e-table-field-chooser-dialog.c       |    2 +-
 widgets/table/e-table-group-container.c            |   21 +-
 widgets/table/e-table-group-leaf.c                 |   11 +-
 widgets/table/e-table-group.c                      |    8 +-
 widgets/table/e-table-group.h                      |    6 +-
 widgets/table/e-table-header-item.c                |    4 +-
 widgets/table/e-table.c                            |   12 +-
 widgets/table/e-table.h                            |    2 +-
 widgets/text/e-text.c                              |   11 +-
 386 files changed, 254946 insertions(+), 178047 deletions(-)

diff --cc addressbook/gui/widgets/Makefile.am
index b5afef0,e14f274..cee9d2f
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@@ -53,12 -60,6 +53,10 @@@ libeabwidgets_la_SOURCES =			
  	gal-view-factory-minicard.c		\
  	gal-view-factory-minicard.h
  
 +libeabwidgets_la_LIBADD =					\
 +	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 +	$(top_builddir)/a11y/addressbook/libevolution-addressbook-a11y.la
 +
- CLEANFILES = $(BUILT_SOURCES)
- 
  dist-hook:
  	cd $(distdir); rm -f $(BUILT_SOURCES)
  
diff --cc calendar/gui/calendar-component.c
index f7f9108,a44b279..b84268c
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@@ -352,88 -997,85 +352,6 @@@ impl_handleURI (PortableServer_Servant 
  }
  
  static void
- <<<<<<< .working
- =======
--impl_upgradeFromVersion (PortableServer_Servant servant,
--			 CORBA_short major,
--			 CORBA_short minor,
--			 CORBA_short revision,
--			 CORBA_Environment *ev)
--{
--	GError *err = NULL;
--	CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant));
--
--	if (!migrate_calendars (calendar_component, major, minor, revision, &err)) {
--		GNOME_Evolution_Component_UpgradeFailed *failedex;
--
--		failedex = GNOME_Evolution_Component_UpgradeFailed__alloc();
--		failedex->what = CORBA_string_dup(_("Failed upgrading calendars."));
--		failedex->why = CORBA_string_dup(err->message);
--		CORBA_exception_set(ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Component_UpgradeFailed, failedex);
--	}
--
--	if (err)
--		g_error_free(err);
--}
--
--static gboolean
--selector_tree_data_dropped (ESourceSelector *selector,
--                            GtkSelectionData *data,
--                            ESource *destination,
--                            GdkDragAction action,
--                            guint info,
--			    CalendarComponent *component)
--{
--	gboolean success = FALSE;
--	ECal *client;
--
--	client = auth_new_cal_from_source (destination, E_CAL_SOURCE_TYPE_EVENT);
--
--	if (!client || !e_cal_open (client, TRUE, NULL)) {
--		if (client)
--			g_object_unref (client);
--
--		return FALSE;
--	}
--
--	if (data->data) {
--		icalcomponent *icalcomp = NULL;
--		char *comp_str; /* do not free this! */
--
--		/* data->data is "source_uid\ncomponent_string" */
--		comp_str = strchr ((char *)data->data, '\n');
--		if (comp_str) {
--			comp_str [0] = 0;
--			comp_str++;
--
--			icalcomp = icalparser_parse_string (comp_str);
--
--			if (icalcomp) {
--				success = cal_comp_process_source_list_drop (client, icalcomp, action, (char *)data->data, component->priv->source_list);
--				icalcomponent_free (icalcomp);
--			}
--		}
--	}
--
--	return success;
--}
--
--static void
--control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
--{
--	CalendarComponentView *component_view = data;
--
--	if (activate) {
--		BonoboUIComponent *uic;
--		uic = bonobo_control_get_ui_component (component_view->view_control);
--
--		e_user_creatable_items_handler_activate (component_view->creatable_items_handler, uic);
--	}
--}
--
--
--static void
- >>>>>>> .merge-right.r37199
  config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
  {
  	CalendarComponent *calendar_component = data;
@@@ -554,11 -1262,14 +472,8 @@@ create_component_view (CalendarComponen
  	component_view->source_list = g_object_ref (priv->source_list);
  	component_view->task_source_list = g_object_ref (priv->task_source_list);
  	component_view->memo_source_list = g_object_ref (priv->memo_source_list);
 -	component_view->vpane_pos = calendar_config_get_tag_vpane_pos ();
 -
  	/* Create sidebar selector */
  	component_view->source_selector = e_source_selector_new (calendar_component->priv->source_list);
- 
- <<<<<<< .working
- =======
 -	e_source_selector_set_select_new ((ESourceSelector *)component_view->source_selector, TRUE);
 -	a11y = gtk_widget_get_accessible (GTK_WIDGET (component_view->source_selector));
 -	atk_object_set_name (a11y, _("Calendar Source Selector"));
 -
  	g_signal_connect (
  		component_view->source_selector, "data-dropped",
  		G_CALLBACK (selector_tree_data_dropped), calendar_component);
@@@ -566,13 -1277,80 +481,73 @@@
  	gtk_drag_dest_set(component_view->source_selector, GTK_DEST_DEFAULT_ALL, drag_types,
  			  num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE);
  
- >>>>>>> .merge-right.r37199
  	gtk_widget_show (component_view->source_selector);
  
+ 	selector_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ 	gtk_container_add (GTK_CONTAINER (selector_scrolled_window), component_view->source_selector);
+ 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+ 					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (selector_scrolled_window),
+ 					     GTK_SHADOW_IN);
+ 	gtk_widget_show (selector_scrolled_window);
+ 
+ 	component_view->info_label = (EInfoLabel *)e_info_label_new("x-office-calendar");
+ 	e_info_label_set_info (component_view->info_label, _("Calendars"), "");
+ 	gtk_widget_show (GTK_WIDGET (component_view->info_label));
+ 
+ 	vbox = gtk_vbox_new(FALSE, 0);
+ 	gtk_box_pack_start(GTK_BOX (vbox), GTK_WIDGET (component_view->info_label), FALSE, TRUE, 0);
+ 	gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0);
+ 	gtk_widget_show (vbox);
+ 
+ 	gtk_paned_pack1 (GTK_PANED (vpane), vbox, FALSE, FALSE);
+ 
+ 	component_view->sidebar_control = bonobo_control_new (vpane);
+ 
+ 	/* Create main view */
+ 	component_view->view_control = control_factory_new_control ();
+ 	if (!component_view->view_control) {
+ 		/* FIXME free memory */
+ 
+ 		return NULL;
+ 	}
+ 
+ 	component_view->calendar = (GnomeCalendar *) bonobo_control_get_widget (component_view->view_control);
+ 
+ 	gtk_paned_pack2 (GTK_PANED (vpane), gnome_calendar_get_tag (component_view->calendar), FALSE, FALSE);
+ 
+ 	/* This signal is thrown if backends die - we update the selector */
+ 	g_signal_connect (component_view->calendar, "source_added",
+ 			  G_CALLBACK (source_added_cb), component_view);
+ 	g_signal_connect (component_view->calendar, "source_removed",
+ 			  G_CALLBACK (source_removed_cb), component_view);
+ 
+ 	/* Create status bar */
+ 	statusbar_widget = e_task_bar_new ();
+ 	component_view->activity_handler = e_activity_handler_new ();
+ 	e_activity_handler_attach_task_bar (component_view->activity_handler, E_TASK_BAR (statusbar_widget));
+ 	e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (statusbar_widget));
+ 
+ 	gtk_widget_show (statusbar_widget);
+ 
+ 	component_view->statusbar_control = bonobo_control_new (statusbar_widget);
+ 
+ 	gnome_calendar_set_activity_handler (component_view->calendar, component_view->activity_handler);
+ 
+ 	/* connect after setting the initial selections, or we'll get unwanted calls
+ 	   to calendar_control_sensitize_calendar_commands */
+ 	g_signal_connect (component_view->source_selector, "selection_changed",
+ 			  G_CALLBACK (source_selection_changed_cb), component_view);
+ 	g_signal_connect (component_view->source_selector, "primary_selection_changed",
+ 			  G_CALLBACK (primary_source_selection_changed_cb), component_view);
+ 	g_signal_connect (component_view->source_selector, "popup_event",
+ 			  G_CALLBACK (popup_event_cb), component_view);
+ 
++>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:calendar/gui/calendar-component.c
  	/* Set up the "new" item handler */
 -	component_view->creatable_items_handler = e_user_creatable_items_handler_new ("calendar", create_local_item_cb, calendar_component);
  	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (control_activate_cb), component_view);
  
 -	/* We use this to update the component information */
 -	set_info (component_view);
 -	g_signal_connect (component_view->calendar, "dates_shown_changed",
 -			  G_CALLBACK (calendar_dates_changed_cb), component_view);
 -
  	/* Load the selection from the last run */
 -	update_selection (component_view);
 -	update_primary_selection (component_view);
  	update_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
  	update_primary_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_TODO);
  	update_task_memo_selection (component_view, E_CAL_SOURCE_TYPE_JOURNAL);
@@@ -669,11 -1556,16 +644,16 @@@ impl_dispose (GObject *object
  		priv->source_list = NULL;
  	}
  
 -	if (priv->gconf_client != NULL) {
 -		g_object_unref (priv->gconf_client);
 -		priv->gconf_client = NULL;
 +	if (priv->activity_handler != NULL) {
 +		g_object_unref (priv->activity_handler);
 +		priv->activity_handler = NULL;
  	}
  
+ 	if (priv->activity_handler != NULL) {
+ 		g_object_unref (priv->activity_handler);
+ 		priv->activity_handler = NULL;
+ 	}
+ 
  	if (priv->create_ecal) {
  		g_object_unref (priv->create_ecal);
  		priv->create_ecal = NULL;
diff --cc calendar/gui/calendar-config.h
index f5fe75b,667962e..224d528
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@@ -259,19 -265,15 +265,26 @@@ gboolean  calendar_config_locale_suppor
  void	  calendar_config_set_dir_path (const char *);
  char *	  calendar_config_get_dir_path (void);
  
- gboolean calendar_config_get_daylight_saving (void);
- void calendar_config_set_daylight_saving (gboolean daylight_saving);
- guint calendar_config_add_notification_daylight_saving (GConfClientNotifyFunc func, gpointer data);
+ GSList *calendar_config_get_day_second_zones (void);
+ void    calendar_config_free_day_second_zones (GSList *zones);
+ void    calendar_config_set_day_second_zone (const char *location);
+ char *  calendar_config_get_day_second_zone (void);
+ void    calendar_config_select_day_second_zone (void);
+ guint   calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data);
+ 
+ /* Birthdays & Anniversaries reminder settings */
+ gboolean calendar_config_get_ba_reminder (int *interval, CalUnits *units);
+ void calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units);
  
 +GSList *calendar_config_get_day_second_zones (void);
 +void    calendar_config_free_day_second_zones (GSList *zones);
 +void    calendar_config_set_day_second_zone (const char *location);
 +char *  calendar_config_get_day_second_zone (void);
 +void    calendar_config_select_day_second_zone (void);
 +guint   calendar_config_add_notification_day_second_zone (GConfClientNotifyFunc func, gpointer data);
 +
 +/* Birthdays & Anniversaries reminder settings */
 +gboolean calendar_config_get_ba_reminder (int *interval, CalUnits *units);
 +void calendar_config_set_ba_reminder (gboolean *enabled, int *interval, CalUnits *units);
 +
  #endif /* _CALENDAR_CONFIG_H_ */
diff --cc calendar/gui/dialogs/cal-prefs-dialog.c
index 21ace5a,60678d9..70058bc
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@@ -643,18 -656,9 +656,12 @@@ show_config (CalendarPrefsDialog *prefs
  	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (prefs->timezone), zone);
  	g_free (location);
  
- 	icalcomp = icaltimezone_get_component (zone);
- 	if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT)))
- 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, FALSE);
- 	else
- 		gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, TRUE);
- 
- 	set = calendar_config_get_daylight_saving ();
- 	gtk_toggle_button_set_active ((GtkToggleButton *) prefs->daylight_saving, set);
+ 	/* Day's second zone */
+ 	update_day_second_zone_caption (prefs);
  
 +	/* Day's second zone */
 +	update_day_second_zone_caption (prefs);
 +
  	/* Working Days. */
  	working_days = calendar_config_get_working_days ();
  	mask = 1 << 0;
diff --cc calendar/gui/dialogs/comp-editor.c
index 65e5e71,7a083a3..9405663
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@@ -95,13 -95,18 +95,18 @@@ struct _CompEditorPrivate 
  	GtkNotebook *notebook;
  
  	/* Attachment handling */
 -	GtkWidget *attachment_bar;
 -	GtkWidget *attachment_scrolled_window;
 -	GtkWidget *attachment_expander;
 -	GtkWidget *attachment_expander_label;
 -	GtkWidget *attachment_expander_icon;
 -	GtkWidget *attachment_expander_num;
 +	GtkWidget *attachment_view;
 +
 +	/* Manages menus and toolbars */
 +	GtkUIManager *manager;
 +
 +	gchar *summary;
  
+ 	/* Manages menus and toolbars */
+ 	GtkUIManager *manager;
+ 
+ 	gchar *summary;
+ 
  	guint32 attachment_bar_visible : 1;
  
  	/* TODO use this flags for setting all the boolean variables
@@@ -1948,9 -2538,9 +1959,9 @@@ comp_editor_set_flags (CompEditor *edit
  	g_object_notify (G_OBJECT (editor), "flags");
  }
  
--
--CompEditorFlags
--comp_editor_get_flags (CompEditor *editor)
++GtkActionGroup *
++comp_editor_get_action_group (CompEditor *editor,
++                              const gchar *group_name)
  {
  	g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE);
  
@@@ -2296,14 -2954,10 +2307,15 @@@ set_attachment_list (CompEditor *editor
  static void
  fill_widgets (CompEditor *editor)
  {
 +	EAttachmentStore *store;
 +	EAttachmentView *view;
  	CompEditorPrivate *priv;
  	GList *l;
+ 	GtkAction *action;
  
 +	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
 +	store = e_attachment_view_get_store (view);
 +
  	priv = editor->priv;
  
  	/*Check if attachments are available here and set them*/
@@@ -2321,8 -2971,13 +2333,11 @@@
  		g_slist_free (attachment_list);
  	}
  
+ 	action = comp_editor_get_action (editor, "classify-public");
+ 	g_signal_handlers_block_by_func (action, G_CALLBACK (classification_changed_cb), editor);
+ 
  	for (l = priv->pages; l != NULL; l = l->next)
  		comp_editor_page_fill_widgets (l->data, priv->comp);
 -
 -	g_signal_handlers_unblock_by_func (action, G_CALLBACK (classification_changed_cb), editor);
  }
  
  static void
diff --cc calendar/gui/dialogs/event-page.c
index 1f09663,2644afb..b0fcdc4
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@@ -2629,12 -2652,15 +2633,12 @@@ set_subscriber_info_string (EventPage *
  }
  
  static void
 -alarm_changed_cb (GtkWidget *widget, gpointer data)
 +alarm_changed_cb (GtkWidget *widget,
 +                  EventPage *epage)
  {
 -	EventPage *epage;
 -	EventPagePrivate *priv;
 -
 -	epage = EVENT_PAGE (data);
 -	priv = epage->priv;
 +	EventPagePrivate *priv = epage->priv;
  
- 	if (e_dialog_option_menu_get (priv->alarm_time, alarm_map) != ALARM_NONE) {
+ 	if (e_dialog_combo_box_get (priv->alarm_time_combo, alarm_map) != ALARM_NONE) {
  		ECalComponentAlarm *ca;
  		ECalComponentAlarmTrigger trigger;
  		icalcomponent *icalcomp;
diff --cc calendar/gui/dialogs/task-page.c
index 88b753b,c3a8e34..486b86e
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@@ -1564,13 -1579,17 +1568,13 @@@ timezone_changed_cb (EDateEdit *dedit
   * category list dialog.
   */
  static void
 -categories_clicked_cb (GtkWidget *button, gpointer data)
 +categories_clicked_cb (GtkWidget *button,
 +                       TaskPage *tpage)
  {
 -	TaskPage *tpage;
 -	TaskPagePrivate *priv;
 -	GtkWidget *entry;
 -
 -	tpage = TASK_PAGE (data);
 -	priv = tpage->priv;
 +	GtkEntry *entry;
  
- 	entry = GTK_ENTRY (tpage->priv->categories);
- 	e_categories_config_open_dialog_for_entry (entry);
+ 	entry = priv->categories;
+ 	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));
  }
  
  static gboolean
diff --cc calendar/gui/e-cal-component-preview.c
index d75f06c,221ae36..9264d44
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@@ -8,11 -8,11 +8,19 @@@
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
++<<<<<<< HEAD:calendar/gui/e-cal-component-preview.c
   *
   * You should have received a copy of the GNU Lesser General Public
   * License along with the program; if not, see <http://www.gnu.org/licenses/>  
   *
   *
++=======
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
++ *
++ *
++>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:calendar/gui/e-cal-component-preview.c
   * Authors:
   *		Federico Mena Quintero <federico ximian com>
   *	    Damon Chaplin <damon ximian com>
diff --cc calendar/gui/e-calendar-table.h
index 4f9bced,e9906ad..a3dba94
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@@ -102,23 -97,27 +102,25 @@@ void		e_calendar_table_paste_clipboard(
  
  /* These load and save the state of the table (headers shown etc.) to/from
     the given file. */
 -void	   e_calendar_table_load_state		(ECalendarTable *cal_table,
 -						 gchar		*filename);
 -void	   e_calendar_table_save_state		(ECalendarTable *cal_table,
 -						 gchar		*filename);
 -
 -void       e_calendar_table_set_activity_handler (ECalendarTable *cal_table,
 -						  EActivityHandler *activity_handler);
 -void       e_calendar_table_set_status_message (ECalendarTable *cal_table,
 -						const gchar *message,
 -						int percent);
 -void 	   e_calendar_table_open_task (ECalendarTable *cal_table,
 -				       ECal *client,
 -				       icalcomponent *icalcomp,
 -				       gboolean assign);
 -ECalModelComponent * e_calendar_table_get_selected_comp (ECalendarTable *cal_table);
 -void e_calendar_table_hide_completed_tasks (ECalendarTable *table, GList *clients_list, gboolean config_changed);
 -
 -void e_calendar_table_process_completed_tasks (ECalendarTable *table, GList *clients_list, gboolean config_changed);
 +void		e_calendar_table_load_state	(ECalendarTable *cal_table,
 +						 const gchar *filename);
 +void		e_calendar_table_save_state	(ECalendarTable *cal_table,
 +						 const gchar *filename);
 +
 +ECalModelComponent *
 +		e_calendar_table_get_selected_comp
 +						(ECalendarTable *cal_table);
 +void		e_calendar_table_hide_completed_tasks
 +						(ECalendarTable *table,
 +						 GList *clients_list,
 +						 gboolean config_changed);
 +void		e_calendar_table_process_completed_tasks
 +						(ECalendarTable *table,
 +						 GList *clients_list,
 +						 gboolean config_changed);
  
+ gboolean ec_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, GtkWidget *etable_wgt, ECalModel *model);
+ 
  G_END_DECLS
  
  #endif /* _E_CALENDAR_TABLE_H_ */
diff --cc calendar/gui/e-calendar-view.c
index 938593a,6c8e1f8..ddd0855
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@@ -834,40 -918,38 +872,69 @@@ clipboard_get_calendar_data (ECalendarV
  		e_calendar_view_add_event (cal_view, client, selected_time_start, default_zone, icalcomp, in_top_canvas);
  	}
  
 +#if 0  /* KILL-BONOBO */
  	e_calendar_view_set_status_message (cal_view, NULL, -1);
 +#endif
 +}
 +
 +static void
 +e_calendar_view_paste_text (ECalendarView *cal_view)
 +{
 +	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 +
 +	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text)
 +		E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text (cal_view);
 +}
 +
 +static void
 +clipboard_paste_received_cb (GtkClipboard *clipboard,
 +			     GtkSelectionData *selection_data,
 +			     gpointer data)
 +{
 +	if (gtk_clipboard_wait_is_text_available (clipboard)) {
 +		e_calendar_view_paste_text (E_CALENDAR_VIEW (data));
 +	} else {
 +		GdkAtom type = selection_data->type;
 +		if (type == gdk_atom_intern (target_types[TARGET_TYPE_VCALENDAR].target, TRUE)) {
 +			gchar *result = NULL;
 +			result = g_strndup ((const gchar *) selection_data->data,
 +					    selection_data->length);
 +			clipboard_get_calendar_data (E_CALENDAR_VIEW (data), result);
 +			g_free (result);
 +		}
 +	}
 +	g_object_unref (data);
  }
  
+ static void
+ e_calendar_view_paste_text (ECalendarView *cal_view)
+ {
+ 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
+ 
+ 	if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text)
+ 		E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (cal_view))->paste_text (cal_view);
+ }
+ 
+ static void
+ clipboard_paste_received_cb (GtkClipboard *clipboard,
+ 			     GtkSelectionData *selection_data,
+ 			     gpointer data)
+ {
+ 	if (gtk_clipboard_wait_is_text_available (clipboard)) {
+ 		e_calendar_view_paste_text (E_CALENDAR_VIEW (data));
+ 	} else {
+ 		GdkAtom type = selection_data->type;
+ 		if (type == gdk_atom_intern (target_types[TARGET_TYPE_VCALENDAR].target, TRUE)) {
+ 			gchar *result = NULL;
+ 			result = g_strndup ((const gchar *) selection_data->data,
+ 					    selection_data->length);
+ 			clipboard_get_calendar_data (E_CALENDAR_VIEW (data), result);
+ 			g_free (result);
+ 		}
+ 	}
+ 	g_object_unref (data);
+ }
+ 
  void
  e_calendar_view_paste_clipboard (ECalendarView *cal_view)
  {
diff --cc calendar/gui/e-memo-table.c
index 490de9f,260103a..abaad08
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@@ -173,368 -177,28 +173,380 @@@ memo_table_date_compare_cb (gconstpoint
  }
  
  static void
 -row_appended_cb (ECalModel *model, EMemoTable *memo_table)
 +memo_table_double_click_cb (EMemoTable *memo_table,
 +                            gint row,
 +                            gint col,
 +                            GdkEvent *event)
  {
 -	g_signal_emit (memo_table, signals[USER_CREATED], 0);
 +	ECalModel *model;
 +	ECalModelComponent *comp_data;
 +
 +	model = e_memo_table_get_model (memo_table);
 +	comp_data = e_cal_model_get_component_at (model, row);
 +	memo_table_emit_open_component (memo_table, comp_data);
  }
  
+ static gboolean
+ query_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
+ {
+ 	EMemoTable *memo_table;
+ 
+ 	g_return_val_if_fail (E_IS_MEMO_TABLE (user_data), FALSE);
+ 
+ 	memo_table = E_MEMO_TABLE (user_data);
+ 
+ 	return ec_query_tooltip (widget, x, y, keyboard_mode, tooltip, GTK_WIDGET (e_memo_table_get_table (memo_table)), memo_table->model);
+ }
+ 
  static void
 -e_memo_table_init (EMemoTable *memo_table)
 +memo_table_model_cal_view_progress_cb (EMemoTable *memo_table,
 +                                       const gchar *message,
 +                                       gint progress,
 +                                       ECalSourceType type)
 +{
 +	gdouble percent = (gdouble) progress;
 +
 +	memo_table_emit_status_message (memo_table, message, percent);
 +}
 +
 +static void
 +memo_table_model_cal_view_done_cb (EMemoTable *memo_table,
 +                                   ECalendarStatus status,
 +                                   ECalSourceType type)
 +{
 +	memo_table_emit_status_message (memo_table, NULL, -1.0);
 +}
 +
 +static gboolean
 +memo_table_query_tooltip_cb (EMemoTable *memo_table,
 +                             gint x,
 +                             gint y,
 +                             gboolean keyboard_mode,
 +                             GtkTooltip *tooltip)
 +{
 +	ECalModel *model;
 +	ECalModelComponent *comp_data;
 +	int row = -1, col = -1;
 +	GtkWidget *box, *l, *w;
 +	GtkStyle *style = gtk_widget_get_default_style ();
 +	char *tmp;
 +	const char *str;
 +	GString *tmp2;
 +	char buff[1001];
 +	gboolean free_text = FALSE;
 +	ECalComponent *new_comp;
 +	ECalComponentOrganizer organizer;
 +	ECalComponentDateTime dtstart, dtdue;
 +	icalcomponent *clone;
 +	icaltimezone *zone, *default_zone;
 +	GSList *desc, *p;
 +	int len;
 +	ETable *etable;
 +	ESelectionModel *esm;
 +	struct tm tmp_tm;
 +
 +	if (keyboard_mode)
 +		return FALSE;
 +
 +	etable = e_memo_table_get_table (memo_table);
 +	e_table_get_mouse_over_cell (etable, x, y, &row, &col);
 +	if (row == -1 || !etable)
 +		return FALSE;
 +
 +	/* Respect sorting option; the 'e_table_get_mouse_over_cell'
 +	 * returns sorted row, not the model one. */
 +	esm = e_table_get_selection_model (etable);
 +	if (esm && esm->sorter && e_sorter_needs_sorting (esm->sorter))
 +		row = e_sorter_sorted_to_model (esm->sorter, row);
 +
 +	model = e_memo_table_get_model (memo_table);
 +	comp_data = e_cal_model_get_component_at (model, row);
 +	if (!comp_data || !comp_data->icalcomp)
 +		return FALSE;
 +
 +	new_comp = e_cal_component_new ();
 +	clone = icalcomponent_new_clone (comp_data->icalcomp);
 +	if (!e_cal_component_set_icalcomponent (new_comp, clone)) {
 +		g_object_unref (new_comp);
 +		return FALSE;
 +	}
 +
 +	box = gtk_vbox_new (FALSE, 0);
 +
 +	str = e_calendar_view_get_icalcomponent_summary (
 +		comp_data->client, comp_data->icalcomp, &free_text);
 +	if (!(str && *str)) {
 +		if (free_text)
 +			g_free ((char *)str);
 +		free_text = FALSE;
 +		str = _("* No Summary *");
 +	}
 +
 +	l = gtk_label_new (NULL);
 +	tmp = g_markup_printf_escaped ("<b>%s</b>", str);
 +	gtk_label_set_line_wrap (GTK_LABEL (l), TRUE);
 +	gtk_label_set_markup (GTK_LABEL (l), tmp);
 +	gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
 +	w = gtk_event_box_new ();
 +
 +	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_SELECTED]));
 +	gtk_widget_modify_fg (l, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
 +	gtk_container_add (GTK_CONTAINER (w), l);
 +	gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
 +	g_free (tmp);
 +
 +	if (free_text)
 +		g_free ((char *)str);
 +	free_text = FALSE;
 +
 +	w = gtk_event_box_new ();
 +	gtk_widget_modify_bg (w, GTK_STATE_NORMAL, &(style->bg[GTK_STATE_NORMAL]));
 +
 +	l = gtk_vbox_new (FALSE, 0);
 +	gtk_container_add (GTK_CONTAINER (w), l);
 +	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
 +	w = l;
 +
 +	e_cal_component_get_organizer (new_comp, &organizer);
 +	if (organizer.cn) {
 +		char *ptr ;
 +		ptr = strchr( organizer.value, ':');
 +
 +		if (ptr) {
 +			ptr++;
 +			/* To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>" */
 +			tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr);
 +		} else {
 +			/* With SunOne accounts, there may be no ':' in organiser.value */
 +			tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn);
 +		}
 +
 +		l = gtk_label_new (tmp);
 +		gtk_label_set_line_wrap (GTK_LABEL (l), FALSE);
 +		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
 +		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
 +		g_free (tmp);
 +	}
 +
 +	e_cal_component_get_dtstart (new_comp, &dtstart);
 +	e_cal_component_get_due (new_comp, &dtdue);
 +
 +	default_zone = e_cal_model_get_timezone (model);
 +
 +	if (dtstart.tzid) {
 +		zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (new_comp), dtstart.tzid);
 +		if (!zone)
 +			e_cal_get_timezone (
 +				comp_data->client, dtstart.tzid, &zone, NULL);
 +		if (!zone)
 +			zone = default_zone;
 +	} else {
 +		zone = NULL;
 +	}
 +
 +	tmp2 = g_string_new ("");
 +
 +	if (dtstart.value) {
 +		buff[0] = 0;
 +
 +		tmp_tm = icaltimetype_to_tm_with_zone (
 +			dtstart.value, zone, default_zone);
 +		e_time_format_date_and_time (
 +			&tmp_tm, calendar_config_get_24_hour_format (),
 +			FALSE, FALSE, buff, 1000);
 +
 +		if (buff [0]) {
 +			g_string_append (tmp2, _("Start: "));
 +			g_string_append (tmp2, buff);
 +		}
 +	}
 +
 +	if (dtdue.value) {
 +		buff[0] = 0;
 +
 +		tmp_tm = icaltimetype_to_tm_with_zone (
 +			dtdue.value, zone, default_zone);
 +		e_time_format_date_and_time (
 +			&tmp_tm, calendar_config_get_24_hour_format (),
 +			FALSE, FALSE, buff, 1000);
 +
 +		if (buff [0]) {
 +			if (tmp2->len)
 +				g_string_append (tmp2, "; ");
 +
 +			g_string_append (tmp2, _("Due: "));
 +			g_string_append (tmp2, buff);
 +		}
 +	}
 +
 +	if (tmp2->len) {
 +		l = gtk_label_new (tmp2->str);
 +		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
 +		gtk_box_pack_start (GTK_BOX (w), l, FALSE, FALSE, 0);
 +	}
 +
 +	g_string_free (tmp2, TRUE);
 +
 +	e_cal_component_free_datetime (&dtstart);
 +	e_cal_component_free_datetime (&dtdue);
 +
 +	tmp2 = g_string_new ("");
 +	e_cal_component_get_description_list (new_comp, &desc);
 +	for (len = 0, p = desc; p != NULL; p = p->next) {
 +		ECalComponentText *text = p->data;
 +
 +		if (text->value != NULL) {
 +			len += strlen (text->value);
 +			g_string_append (tmp2, text->value);
 +			if (len > 1024) {
 +				g_string_set_size (tmp2, 1020);
 +				g_string_append (tmp2, "...");
 +				break;
 +			}
 +		}
 +	}
 +	e_cal_component_free_text_list (desc);
 +
 +	if (tmp2->len) {
 +		l = gtk_label_new (tmp2->str);
 +		gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
 +		gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
 +	}
 +
 +	g_string_free (tmp2, TRUE);
 +
 +	gtk_widget_show_all (box);
 +	gtk_tooltip_set_custom (tooltip, box);
 +
 +	g_object_unref (new_comp);
 +
 +	return TRUE;
 +}
 +
 +static gboolean
 +memo_table_popup_menu_cb (EMemoTable *memo_table)
 +{
 +	memo_table_emit_popup_event (memo_table, NULL);
 +
 +	return TRUE;
 +}
 +
 +static gint
 +memo_table_right_click_cb (EMemoTable *memo_table,
 +                           gint row,
 +                           gint col,
 +                           GdkEvent *event)
 +{
 +	memo_table_emit_popup_event (memo_table, event);
 +
 +	return TRUE;
 +}
 +
 +static void
 +memo_table_set_model (EMemoTable *memo_table,
 +                      ECalModel *model)
 +{
 +	g_return_if_fail (memo_table->priv->model == NULL);
 +
 +	memo_table->priv->model = g_object_ref (model);
 +
 +	g_signal_connect_swapped (
 +		model, "row-appended",
 +		G_CALLBACK (memo_table_emit_user_created), memo_table);
 +
 +	g_signal_connect_swapped (
 +		model, "cal-view-progress",
 +		G_CALLBACK (memo_table_model_cal_view_progress_cb),
 +		memo_table);
 +
 +	g_signal_connect_swapped (
 +		model, "cal-view-done",
 +		G_CALLBACK (memo_table_model_cal_view_done_cb),
 +		memo_table);
 +}
 +
 +static void
 +memo_table_set_shell_view (EMemoTable *memo_table,
 +                           EShellView *shell_view)
  {
 -	GtkWidget *table;
 -	ETable *e_table;
 +	g_return_if_fail (memo_table->priv->shell_view == NULL);
 +
 +	memo_table->priv->shell_view = shell_view;
 +
 +	g_object_add_weak_pointer (
 +		G_OBJECT (shell_view),
 +		&memo_table->priv->shell_view);
 +}
 +
 +static void
 +memo_table_set_property (GObject *object,
 +                         guint property_id,
 +                         const GValue *value,
 +                         GParamSpec *pspec)
 +{
 +	switch (property_id) {
 +		case PROP_MODEL:
 +			memo_table_set_model (
 +				E_MEMO_TABLE (object),
 +				g_value_get_object (value));
 +			return;
 +
 +		case PROP_SHELL_VIEW:
 +			memo_table_set_shell_view (
 +				E_MEMO_TABLE (object),
 +				g_value_get_object (value));
 +			return;
 +	}
 +
 +	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 +}
 +
 +static void
 +memo_table_get_property (GObject *object,
 +                         guint property_id,
 +                         GValue *value,
 +                         GParamSpec *pspec)
 +{
 +	switch (property_id) {
 +		case PROP_MODEL:
 +			g_value_set_object (
 +				value, e_memo_table_get_model (
 +				E_MEMO_TABLE (object)));
 +			return;
 +
 +		case PROP_SHELL_VIEW:
 +			g_value_set_object (
 +				value, e_memo_table_get_shell_view (
 +				E_MEMO_TABLE (object)));
 +			return;
 +	}
 +
 +	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 +}
 +
 +static void
 +memo_table_dispose (GObject *object)
 +{
 +	EMemoTablePrivate *priv;
 +
 +	priv = E_MEMO_TABLE_GET_PRIVATE (object);
 +
 +	if (priv->model != NULL) {
 +		g_object_unref (priv->model);
 +		priv->model = NULL;
 +	}
 +
 +	/* Chain up to parent's dispose() method. */
 +	G_OBJECT_CLASS (parent_class)->dispose (object);
 +}
 +
 +static void
 +memo_table_constructed (GObject *object)
 +{
 +	EMemoTable *memo_table;
 +	GtkWidget *widget;
 +	ECalModel *model;
 +	ETable *table;
  	ECell *cell, *popup_cell;
  	ETableExtras *extras;
  	gint i;
diff --cc calendar/gui/gnome-cal.c
index 4db5346,c2e4511..7e685dc
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@@ -52,8 -53,8 +53,7 @@@
  #include "e-comp-editor-registry.h"
  #include "dialogs/delete-error.h"
  #include "dialogs/event-editor.h"
 -#include "dialogs/task-editor.h"
  #include "comp-util.h"
- #include "e-calendar-marshal.h"
  #include "e-cal-model-calendar.h"
  #include "e-day-view.h"
  #include "e-day-view-config.h"
@@@ -1025,19 -1277,23 +1027,14 @@@ set_timezone (GnomeCalendar *calendar
  
  	priv->zone = calendar_config_get_icaltimezone ();
  
 -	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
 -		GList *l;
 -
 -		for (l = priv->clients_list[i]; l != NULL; l = l->next) {
 -			ECal *client = l->data;
 -
 -			if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
 -				/* FIXME Error checking */
 -				e_cal_set_default_timezone (client, priv->zone, NULL);
 -		}
 +	for (l = priv->clients_list; l != NULL; l = l->next) {
 +		ECal *client = l->data;
  
 -		if (priv->default_client[i]
 -		    && e_cal_get_load_state (priv->default_client[i]) == E_CAL_LOAD_LOADED)
 +		if (e_cal_get_load_state (client) == E_CAL_LOAD_LOADED)
  			/* FIXME Error checking */
 -			e_cal_set_default_timezone (priv->default_client[i], priv->zone, NULL);
 +			e_cal_set_default_timezone (client, priv->zone, NULL);
  	}
  
- 	if (priv->default_client[i]
- 	    && e_cal_get_load_state (priv->default_client[i]) == E_CAL_LOAD_LOADED)
- 		/* FIXME Error checking */
- 		e_cal_set_default_timezone (priv->default_client[i], priv->zone, NULL);
- 
  	if (priv->views [priv->current_view_type])
  		e_calendar_view_set_timezone (priv->views [priv->current_view_type], priv->zone);
  }
@@@ -1525,9 -1825,35 +1522,11 @@@ setup_widgets (GnomeCalendar *gcal
  	gtk_widget_show (label);
  	gtk_widget_show (vbox);
  
 -	filename = g_build_filename (memos_component_peek_config_directory (memos_component_peek ()),
 -				     "MemoPad", NULL);
 -	e_memo_table_load_state (E_MEMO_TABLE (priv->memo), filename);
 +	e_cal_model_set_default_time_func (e_memo_table_get_model (E_MEMO_TABLE (priv->memo)), gc_get_default_time, gcal);
  
+ 	e_cal_model_set_default_time_func (e_memo_table_get_model (E_MEMO_TABLE (priv->memo)), gc_get_default_time, gcal);
+ 
  	update_memo_view (gcal);
 -	g_free (filename);
 -
 -	etable = e_memo_table_get_table (E_MEMO_TABLE (priv->memo));
 -	g_signal_connect (etable->table_canvas, "focus_in_event",
 -			  G_CALLBACK (memo_canvas_focus_change_cb), gcal);
 -	g_signal_connect (etable->table_canvas, "focus_out_event",
 -			  G_CALLBACK (memo_canvas_focus_change_cb), gcal);
 -
 -	g_signal_connect (etable, "selection_change",
 -			  G_CALLBACK (memo_selection_change_cb), gcal);
 -
 -	g_signal_connect (e_memo_table_get_model ((EMemoTable *)priv->memo), "cal_view_progress",
 -				G_CALLBACK (view_progress_cb), gcal);
 -	g_signal_connect (e_memo_table_get_model ((EMemoTable *)priv->memo), "cal_view_done",
 -				G_CALLBACK (view_done_cb), gcal);
 -
  }
  
  /* Object initialization function for the gnome calendar */
@@@ -1539,11 -1866,12 +1538,14 @@@ gnome_calendar_init (GnomeCalendar *gca
  	priv = g_new0 (GnomeCalendarPrivate, 1);
  	gcal->priv = priv;
  
 -	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++)
 -		priv->clients[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 +	priv->clients = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
 +
 +	if (non_intrusive_error_table == NULL)
 +		non_intrusive_error_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
  
+ 	if (non_intrusive_error_table == NULL)
+ 		non_intrusive_error_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
+ 
  	e_categories_register_change_listener (G_CALLBACK (categories_changed_cb), gcal);
  
  	priv->todo_update_lock = g_mutex_new ();
@@@ -1664,8 -2051,20 +1666,10 @@@ gnome_calendar_destroy (GtkObject *obje
  		g_signal_handlers_disconnect_by_func (cal_model,
  				G_CALLBACK (view_done_cb), gcal);
  
 -		cal_model = e_calendar_table_get_model ((ECalendarTable *) priv->todo);
 -		g_signal_handlers_disconnect_by_func (cal_model,
 -				G_CALLBACK (view_progress_cb), gcal);
 -		g_signal_handlers_disconnect_by_func (cal_model,
 -				G_CALLBACK (view_done_cb), gcal);
 -
 -		cal_model = e_memo_table_get_model ((EMemoTable *)priv->memo);
 -		g_signal_handlers_disconnect_by_func (cal_model,
 -				G_CALLBACK (view_progress_cb), gcal);
 -		g_signal_handlers_disconnect_by_func (cal_model,
 -				G_CALLBACK (view_done_cb), gcal);
 +		g_mutex_free (priv->todo_update_lock);
  
+ 		g_mutex_free (priv->todo_update_lock);
+ 
  		g_free (priv);
  		gcal->priv = NULL;
  	}
@@@ -2110,34 -2655,140 +2114,69 @@@ struct _mclient_msg 
  };
  
  static void
 -gc_popup_free (EPopup *ep, GSList *list, void *data)
 +add_mclient_async (struct _mclient_msg *msg)
  {
 -	while (list) {
 -		GSList *n = list->next;
 -		EPopupItem *pitem = list->data;
 -
 -		g_free(pitem->path);
 -		g_free(pitem->label);
 -		g_free(pitem->user_data);
 -		g_free(pitem);
 -		g_slist_free_1(list);
 -		list = n;
 -	}
 -}
 +	e_cal_model_add_client (msg->model, msg->client);
  
 -static void
 -gc_popup_free_static (EPopup *ep, GSList *list, void *data)
 -{
 -	while (list) {
 -		GSList *n = list->next;
 -		EPopupItem *pitem = list->data;
 -
 -		g_free(pitem->path);
 -		g_free(pitem);
 -		g_slist_free_1(list);
 -		list = n;
 -	}
 +	g_object_unref (msg->client);
 +	g_object_unref (msg->model);
 +	g_slice_free (struct _mclient_msg, msg);
  }
  
 -void
 -gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *prefix)
 +static void
 +add_mclient (ECalModel *model, ECal *client)
  {
 -	GnomeCalendarPrivate *priv;
 -	int length;
 -	int i;
 -	gboolean found = FALSE;
 -	char *id;
 -	GSList *menus = NULL;
 -	EPopupItem *pitem;
 -
 -	g_return_if_fail (gcal != NULL);
 -	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 -	g_return_if_fail (prefix != NULL);
 -
 -	priv = gcal->priv;
 -
 -	g_return_if_fail (priv->view_instance != NULL);
 -
 -	length = gal_view_collection_get_count(priv->view_instance->collection);
 -	id = gal_view_instance_get_current_view_id (priv->view_instance);
 -
 -	for (i = 0; i < length; i++) {
 -		GalViewCollectionItem *item = gal_view_collection_get_view_item(priv->view_instance->collection, i);
 -
 -		pitem = g_malloc0(sizeof(*pitem));
 -		pitem->type = E_POPUP_RADIO;
 -		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i);
 -		pitem->label = g_strdup(item->title);
 -		pitem->activate = gc_set_view;
 -		pitem->user_data = g_strdup(item->id);
 -
 -		if (!found && id && !strcmp (id, item->id)) {
 -			found = TRUE;
 -			pitem->type |= E_POPUP_ACTIVE;
 -		}
 -
 -		menus = g_slist_prepend(menus, pitem);
 -	}
 -
 -	if (menus)
 -		e_popup_add_items(ep, menus, NULL, gc_popup_free, gcal);
 +	struct _mclient_msg *msg;
  
 -	menus = NULL;
 -	for (i = found?3:0; i<sizeof(gc_popups)/sizeof(gc_popups[0]);i++) {
 -		pitem = g_malloc0(sizeof(*pitem));
 -		memcpy(pitem, &gc_popups[i], sizeof(*pitem));
 -		pitem->path = g_strdup_printf("%s/%02d.item", prefix, i+length);
 -		menus = g_slist_prepend(menus, pitem);
 -	}
 +	msg = g_slice_new0 (struct _mclient_msg);
 +	msg->header.func = (MessageFunc) add_mclient_async;
 +	msg->model = g_object_ref (model);
 +	msg->client = g_object_ref (client);
  
 -	e_popup_add_items(ep, menus, NULL, gc_popup_free_static, gcal);
 +	message_push ((Message *) msg);
  }
  
 -static void
 -gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
 +static void 
 +non_intrusive_error_remove(GtkWidget *w, void *data)
  {
 -	GnomeCalendarPrivate *priv;
 -
 -	priv = gcal->priv;
 -
 -	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
 -		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos_month_view);
 -		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos_month_view);
 -	} else {
 -		gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos);
 -		gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos);
 -	}
 +	g_hash_table_remove(non_intrusive_error_table, data);
  }
  
+ struct _mclient_msg {
+ 	Message header;
+ 	ECalModel *model;
+ 	ECal *client;
+ };
+ 
+ static void
+ add_mclient_async (struct _mclient_msg *msg)
+ {
+ 	e_cal_model_add_client (msg->model, msg->client);
+ 
+ 	g_object_unref (msg->client);
+ 	g_object_unref (msg->model);
+ 	g_slice_free (struct _mclient_msg, msg);
+ }
+ 
+ static void
+ add_mclient (ECalModel *model, ECal *client)
+ {
+ 	struct _mclient_msg *msg;
+ 
+ 	msg = g_slice_new0 (struct _mclient_msg);
+ 	msg->header.func = (MessageFunc) add_mclient_async;
+ 	msg->model = g_object_ref (model);
+ 	msg->client = g_object_ref (client);
+ 
+ 	message_push ((Message *) msg);
+ }
+ 
+ static void 
+ non_intrusive_error_remove(GtkWidget *w, void *data)
+ {
+ 	g_hash_table_remove(non_intrusive_error_table, data);
+ }
+ 
  static void
  client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
  {
diff --cc calendar/gui/tasks-control.c
index 0160462,a0633aa..62a283f
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@@ -163,10 -256,27 +173,20 @@@ selection_changed_cb (ETasks *tasks, in
  	tasks_control_sensitize_commands (control, tasks, n_selected);
  }
  
+ static gboolean
+ tasks_control_focus_changed (GtkWidget *widget, GdkEventFocus *event, struct focus_changed_data *fc_data)
+ {
+ 	g_return_val_if_fail (fc_data != NULL, FALSE);
+ 
+ 	tasks_control_sensitize_commands (fc_data->control, fc_data->tasks, -1);
+ 
+ 	return FALSE;
+ }
+ 
  static BonoboUIVerb verbs [] = {
 -	BONOBO_UI_VERB ("TasksOpenTask", tasks_control_open_task_cmd),
  	BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd),
 -	BONOBO_UI_VERB ("TasksCut", tasks_control_cut_cmd),
 -	BONOBO_UI_VERB ("TasksCopy", tasks_control_copy_cmd),
 -	BONOBO_UI_VERB ("TasksPaste", tasks_control_paste_cmd),
 -	BONOBO_UI_VERB ("TasksDelete", tasks_control_delete_cmd),
  	BONOBO_UI_VERB ("TasksMarkComplete", tasks_control_complete_cmd),
  	BONOBO_UI_VERB ("TasksPurge", tasks_control_purge_cmd),
 -	BONOBO_UI_VERB ("TasksPrint", tasks_control_print_cmd),
 -	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),
  	BONOBO_UI_VERB ("TasksAssign", tasks_control_assign_cmd),
          BONOBO_UI_VERB ("TasksForward", tasks_control_forward_cmd),
  	BONOBO_UI_VERB_END
diff --cc composer/e-msg-composer.h
index 42f12bf,f6b2ca7..ec8a6e3
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@@ -152,11 -151,15 +152,16 @@@ void		e_msg_composer_set_send_options	(
  GByteArray *	e_msg_composer_get_raw_message_text
  						(EMsgComposer *composer);
  
 -struct _EAttachmentBar *
 -		e_msg_composer_get_attachment_bar
 -						(EMsgComposer *composer);
 +gboolean	e_msg_composer_is_exiting	(EMsgComposer *composer);
 +
 +GList *		e_load_spell_languages		(void);
 +void		e_save_spell_languages		(GList *spell_languages);
  
+ gboolean	e_msg_composer_is_exiting	(EMsgComposer *composer);
+ 
+ GList *		e_load_spell_languages		(void);
+ void		e_save_spell_languages		(GList *spell_languages);
+ 
  G_END_DECLS
  
  #endif /* E_MSG_COMPOSER_H */
diff --cc filter/filter-option.c
index 7af511b,3b93084..2e76eca
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@@ -346,17 -346,17 +346,40 @@@ combobox_changed (GtkWidget *widget, Fi
  {
  	FilterOption *fo = (FilterOption *)fe;
  
- 	fo->current = g_object_get_data ((GObject *) widget, "option");
+ 	fo->current = (struct _filter_option *) g_list_nth (fo->options, gtk_combo_box_get_active (GTK_COMBO_BOX (widget)));
+ }
+ 
+ static GSList *
+ get_dynamic_options (FilterOption *fo)
+ {
+ 	GModule *module;
+ 	GSList *(*get_func)(void);
+ 	GSList *res = NULL;
+ 
+ 	if (!fo || !fo->dynamic_func)
++		return res;
++
++	module = g_module_open (NULL, G_MODULE_BIND_LAZY);
++
++	if (g_module_symbol (module, fo->dynamic_func, (gpointer) &get_func)) {
++		res = get_func ();
++	} else {
++		g_warning ("optionlist dynamic fill function '%s' not found", fo->dynamic_func);
++	}
++
++	g_module_close (module);
++
++	return res;
 +}
 +
 +static GSList *
 +get_dynamic_options (FilterOption *fo)
 +{
 +	GModule *module;
 +	GSList *(*get_func)(void);
 +	GSList *res = NULL;
 +
 +	if (!fo || !fo->dynamic_func)
  		return res;
  
  	module = g_module_open (NULL, G_MODULE_BIND_LAZY);
diff --cc mail/em-composer-prefs.h
index 623fee0,82c6ece..19d753e
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@@ -63,13 -62,28 +63,14 @@@ struct _EMComposerPrefs 
  	/* Default Behavior */
  	GtkOptionMenu *charset;
  
 -	GtkColorButton *color;
  	GtkTreeModel *language_model;
  
- 	/* Keyboard Shortcuts */
- 	GtkOptionMenu *shortcuts_type;
+ 	/* Forwards and Replies */
+ 	GtkComboBox *forward_style;
+ 	GtkComboBox *reply_style;
  
  	/* Signatures */
 -	GtkTreeView *sig_list;
 -	GHashTable *sig_hash;
 -	GtkButton *sig_add;
 -	GtkButton *sig_add_script;
 -	GtkButton *sig_edit;
 -	GtkButton *sig_delete;
  	struct _GtkHTML *sig_preview;
 -
 -	struct _GladeXML *sig_script_gui;
 -	GtkWidget *sig_script_dialog;
 -
 -	guint sig_added_id;
 -	guint sig_removed_id;
 -	guint sig_changed_id;
  };
  
  struct _EMComposerPrefsClass {
diff --cc mail/em-folder-browser.c
index 5d47304,58e42a5..bfc69f9
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@@ -864,6 -1791,17 +864,14 @@@ static BonoboUIVerb emfb_verbs[] = 
  	BONOBO_UI_VERB_END
  };
  
 -static EPixmap emfb_pixmaps[] = {
 -	E_PIXMAP ("/commands/FolderCreate", "folder-new", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/commands/FolderCopy", "folder-copy", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU),
 -	E_PIXMAP ("/commands/MessageMarkAllAsRead", "mail-read", E_ICON_SIZE_MENU),
 -
 -	E_PIXMAP_END
 -};
 -
++static gboolean
++emfb_select_all_daemon (MessageList *ml)
++{
++		message_list_select_all(ml);
++		gtk_widget_grab_focus ((GtkWidget *)ml);
++		return FALSE;
++}
+ 
  static void
  emfb_hide_deleted(BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type, const char *state, void *data)
  {
diff --cc mail/em-folder-utils.c
index cb1c333,ea177b6..64e9dcf
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@@ -57,7 -59,9 +57,8 @@@
  #include "mail-ops.h"
  #include "mail-tools.h"
  #include "mail-config.h"
 -#include "mail-component.h"
  #include "mail-vfolder.h"
+ #include "mail-folder-cache.h"
  
  #include "em-utils.h"
  #include "em-popup.h"
@@@ -400,17 -399,26 +401,25 @@@ emfu_delete_response (GtkWidget *dialog
  void
  em_folder_utils_delete_folder (CamelFolder *folder)
  {
 -	CamelStore *local;
 +	CamelStore *local_store;
  	GtkWidget *dialog;
+ 	char *uri;
+ 	int flags = 0;
  
 -	local = mail_component_peek_local_store (NULL);
 +	local_store = e_mail_shell_module_get_local_store (mail_shell_module);
  
 -	if (folder->parent_store == local && emfu_is_special_local_folder (folder->full_name)) {
 +	if (folder->parent_store == local_store && emfu_is_special_local_folder (folder->full_name)) {
  		dialog = e_error_new (NULL, "mail:no-delete-special-folder", folder->full_name, NULL);
  		em_utils_show_error_silent (dialog);
  		return;
  	}
+ 	
+ 	if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) 
+ 	{
+ 		e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL);
+ 		return;
+ 	}
  
 -	g_free (uri);
  	camel_object_ref (folder);
  
  	dialog = e_error_new(NULL,
@@@ -685,12 -694,18 +695,18 @@@ em_folder_utils_create_folder (CamelFol
  	EMFolderTreeModel *model;
  	GtkWidget *dialog;
  
 -	model = mail_component_peek_tree_model (mail_component_peek ());
 +	model = e_mail_shell_module_get_folder_tree_model (mail_shell_module);
  	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
  
 -	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
 +	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create Folder"), _("Specify where to create the folder:"));
  	if (folderinfo != NULL)
  		em_folder_selector_set_selected ((EMFolderSelector *) dialog, folderinfo->uri);
+ 	if (parent) {
+ 		gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+ 		gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+ 		if (gtk_window_get_modal (parent))
+ 			gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+ 	}
  	g_signal_connect (dialog, "response", G_CALLBACK (emfu_popup_new_folder_response), emft);
  	gtk_widget_show (dialog);
  }
diff --cc mail/em-mailer-prefs.h
index ba7a62d,3b52d9f..c7dc6ac
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@@ -68,51 -72,70 +68,58 @@@ struct _EMMailerPrefs 
  	/* General tab */
  
  	/* Message Display */
 -	struct _GtkToggleButton *timeout_toggle;
 -	struct _GtkSpinButton *timeout;
 -	struct _GtkToggleButton *address_toggle;
 -	struct _GtkSpinButton *address_count;
 -	struct _GtkToggleButton *mlimit_toggle;
 -	struct _GtkSpinButton *mlimit_count;
 -	struct _GtkOptionMenu *charset;
 -	struct _GtkToggleButton *citation_highlight;
 -	struct _GtkColorButton *citation_color;
 -	struct _GtkToggleButton *enable_search_folders;
 -	struct _GtkToggleButton *magic_spacebar;
 +	GtkSpinButton *timeout;
 +	GtkOptionMenu *charset;
  
  	/* Deleting Mail */
- 	GtkOptionMenu *empty_trash_days;
+ 	struct _GtkToggleButton *empty_trash;
+ 	struct _GtkComboBox *empty_trash_days;
+ 	struct _GtkToggleButton *confirm_expunge;
+ 
+ 	/* HTML Mail tab */
 -	struct _GtkFontButton *font_variable;
 -	struct _GtkFontButton *font_fixed;
 -	struct _GtkToggleButton *font_share;
++	GtkFontButton *font_variable;
++	GtkFontButton *font_fixed;
++	GtkToggleButton *font_share;
  
  	/* Loading Images */
 -	struct _GtkToggleButton *images_always;
 -	struct _GtkToggleButton *images_sometimes;
 -	struct _GtkToggleButton *images_never;
 +	GtkToggleButton *images_always;
 +	GtkToggleButton *images_sometimes;
 +	GtkToggleButton *images_never;
  
 -	struct _GtkToggleButton *show_animated;
 -	struct _GtkToggleButton *autodetect_links;
 -	struct _GtkToggleButton *prompt_unwanted_html;
 +	GtkToggleButton *autodetect_links;
  
  	/* Labels and Colours tab */
 -	struct _GtkWidget *label_add;
 -	struct _GtkWidget *label_edit;
 -	struct _GtkWidget *label_remove;
 -	struct _GtkWidget *label_tree;
 +	GtkWidget *label_add;
 +	GtkWidget *label_edit;
 +	GtkWidget *label_remove;
 +	GtkWidget *label_tree;
 +	GtkListStore *label_list_store;
  	guint labels_change_notify_id; /* mail_config's notify id */
  
  	/* Headers tab */
 -	struct _GtkButton *add_header;
 -	struct _GtkButton *remove_header;
 -	struct _GtkEntry *entry_header;
 -	struct _GtkTreeView *header_list;
 -	struct _GtkListStore *header_list_store;
 -	struct _GtkToggleButton *photo_show;
 -	struct _GtkToggleButton *photo_local;
 +	GtkButton *add_header;
 +	GtkButton *remove_header;
 +	GtkEntry *entry_header;
 +	GtkTreeView *header_list;
 +	GtkListStore *header_list_store;
  
  	/* Junk prefs */
 -	struct _GtkToggleButton *check_incoming;
 -	struct _GtkToggleButton *empty_junk;
 -	struct _GtkComboBox *empty_junk_days;
 +	GtkToggleButton *empty_junk;
- 	GtkOptionMenu *empty_junk_days;
++	GtkComboBox *empty_junk_days;
  	
 -	struct _GtkToggleButton *sa_local_tests_only;
 -	struct _GtkToggleButton *sa_use_daemon;
 -	struct _GtkComboBox *default_junk_plugin;
 -	struct _GtkLabel *plugin_status;
 -	struct _GtkImage *plugin_image;
 -
 -	struct _GtkToggleButton *junk_header_check;
 -	struct _GtkTreeView *junk_header_tree;
 -	struct _GtkButton *junk_header_add;
 -	struct _GtkButton *junk_header_remove;
 -	struct _GtkToggleButton *junk_book_lookup;
 -	struct _GtkToggleButton *junk_lookup_local_only;
 +	GtkToggleButton *sa_local_tests_only;
 +	GtkToggleButton *sa_use_daemon;
 +	GtkComboBox *default_junk_plugin;
 +	GtkLabel *plugin_status;
 +	GtkImage *plugin_image;
 +
 +	GtkToggleButton *junk_header_check;
 +	GtkTreeView *junk_header_tree;
 +	GtkListStore *junk_header_list_store;	
 +	GtkButton *junk_header_add;
 +	GtkButton *junk_header_remove;
 +	GtkToggleButton *junk_book_lookup;
 +	GtkToggleButton *junk_lookup_local_only;
  };
  
  struct _EMMailerPrefsClass {
diff --cc mail/em-subscribe-editor.c
index 8abd89b,724b9b4..a47c6b9
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@@ -856,14 -872,29 +874,29 @@@ em_subscribe_editor_new(void
  	w = glade_xml_get_widget(xml, "refresh_button");
  	g_signal_connect(w, "clicked", G_CALLBACK(sub_editor_refresh), se);
  
- 	/* setup stores menu */
- 	se->optionmenu = glade_xml_get_widget(xml, "store_menu");
- 	menu = gtk_menu_new();
- 	se->none_selected_item = w = gtk_menu_item_new_with_label(_("No server has been selected"));
- 	gtk_widget_show(w);
- 	gtk_menu_shell_append ((GtkMenuShell *)menu, w);
+ 	/* setup stores combobox */
+ 	se->combobox = glade_xml_get_widget (xml, "store_combobox");
+ 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ 	gtk_combo_box_set_model (GTK_COMBO_BOX (se->combobox), GTK_TREE_MODEL (store));
+ 	g_object_unref (store);
+ 
+ 	gtk_cell_layout_clear (GTK_CELL_LAYOUT (se->combobox));
+ 
+ 	cell = gtk_cell_renderer_text_new ();
+ 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (se->combobox), cell, TRUE);
+ 	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (se->combobox), cell,
+                                   "text", 0,
+                                   "visible", 1,
+                                   NULL);
+ 
+ 	gtk_list_store_append (store, &gtiter);
+ 	gtk_list_store_set (
+ 		store, &gtiter,
+ 		0, _("No server has been selected"),
+ 		1, TRUE,
+ 		-1);
  
 -	accounts = mail_config_get_accounts ();
 +	accounts = e_get_account_list ();
  	for (iter = e_list_get_iterator ((EList *) accounts);
  	     e_iterator_is_valid (iter);
  	     e_iterator_next (iter)) {
diff --cc mail/em-utils.c
index a98359e,7685e76..7e11087
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@@ -2071,7 -2051,15 +2077,16 @@@ try_open_e_book (EBook *book, gboolean 
  	e_flag_wait (flag);
  	e_flag_free (flag);
  
- 	return data.result;
+ 	return data.result && (!error || !*error);
+ }
+ 
+ static gboolean
+ is_local (ESourceGroup *group)
+ {
+ 	return group &&
+ 		e_source_group_peek_base_uri (group) &&
+ 		g_str_has_prefix (e_source_group_peek_base_uri (group), "file://");
++>>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:mail/em-utils.c
  }
  
  gboolean
diff --cc mail/mail-config.c
index 3c39791,5fa562e..1e0bfd2
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@@ -657,29 -753,56 +673,28 @@@ mail_config_get_allowable_mime_types (v
  	return (const char **) config->mime_types->pdata;
  }
  
 -gboolean
 -mail_config_find_account (EAccount *account)
 +static gboolean
 +mail_config_account_url_equal (const CamelURL *u1,
 +                               const CamelURL *u2)
  {
 -	EAccount *acnt;
 -	EIterator *iter;
 +	/* For the purpose of matching a URL to an EAccount, only compare
 +	 * the protocol, user, host and port and disregard the rest. */
  
 -	iter = e_list_get_iterator ((EList *) config->accounts);
 -	while (e_iterator_is_valid (iter)) {
 -		acnt = (EAccount *) e_iterator_get (iter);
 -		if (acnt == account) {
 -			g_object_unref (iter);
 -			return TRUE;
 -		}
 +	if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
 +		return FALSE;
  
 -		e_iterator_next (iter);
 -	}
 +	if (g_strcmp0 (u1->user, u2->user) != 0)
 +		return FALSE;
  
 -	g_object_unref (iter);
 +	if (g_strcmp0 (u1->host, u2->host) != 0)
 +		return FALSE;
  
 -	return FALSE;
 -}
 -
 -EAccount *
 -mail_config_get_default_account (void)
 -{
 -	if (config == NULL)
 -		mail_config_init ();
 -
 -	if (!config->accounts)
 -		return NULL;
 -
 -	/* should probably return const */
 -	return (EAccount *)e_account_list_get_default(config->accounts);
 -}
 -
 -EAccount *
 -mail_config_get_account_by_name (const char *account_name)
 -{
 -	return (EAccount *)e_account_list_find(config->accounts, E_ACCOUNT_FIND_NAME, account_name);
 -}
 -
 -EAccount *
 -mail_config_get_account_by_uid (const char *uid)
 -{
 -	return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid);
 +	return (u1->port == u2->port);
  }
  
- EAccount *
- mail_config_get_account_by_source_url (const char *source_url)
+ static EAccount *
+ mc_get_account_by (const char *given_url, const char * (get_url_string)(EAccount *account))
  {
- 	EAccountList *account_list;
  	EAccount *account = NULL;
  	EIterator *iter;
  	CamelURL *url;
diff --cc mail/mail-session.c
index 58b6758,4997a29..b177666
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@@ -740,16 -728,18 +740,22 @@@ mail_session_init (EShellModule *shell_
  								session, NULL, NULL);
  	session->junk_plugin = NULL;
  
 -	/* The shell will tell us to go online. */
 -	camel_session_set_online ((CamelSession *) session, FALSE);
 +	camel_session_set_online ((CamelSession *) session, online);
  	mail_config_reload_junk_headers ();
 -	g_free (camel_dir);
 +}
 +
 +void
 +mail_session_shutdown (void)
 +{
 +	camel_shutdown ();
  }
  
+ void
+ mail_session_shutdown (void)
+ {
+ 	camel_shutdown ();
+ }
+ 
  gboolean
  mail_session_get_interactive (void)
  {
diff --cc mail/message-list.c
index 7a87d17,a2a9989..5ae5ba2
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@@ -4228,16 -4053,22 +4229,22 @@@ regen_list_exec (struct _regen_list_ms
  
  			/* cursor_uid has been filtered out */
  			if (i == uids->len) {
- 				gboolean was_deleted = (camel_folder_get_message_flags (m->folder, looking_for) & CAMEL_MESSAGE_DELETED) != 0;
+ 				CamelMessageInfo *looking_info = camel_folder_get_message_info (m->folder, looking_for);
  
- 				/* I would really like to check for CAMEL_MESSAGE_FOLDER_FLAGGED on a message,
- 				   so I would know whether it was changed locally, and then just check the changes
- 				   struct whether change came from the server, but with periodical save it doesn't
- 				   matter. So here just check whether the file was deleted and we show it based
- 				   on the flag whether we can view deleted messages or not. */
+ 				if (looking_info) {
+ 					gboolean was_deleted = (camel_message_info_flags (looking_info) & CAMEL_MESSAGE_DELETED) != 0;
+ 
+ 					/* I would really like to check for CAMEL_MESSAGE_FOLDER_FLAGGED on a message,
+ 					   so I would know whether it was changed locally, and then just check the changes
+ 					   struct whether change came from the server, but with periodical save it doesn't
+ 					   matter. So here just check whether the file was deleted and we show it based
+ 					   on the flag whether we can view deleted messages or not. */
+ 
+ 					if (!was_deleted || (was_deleted && !m->hidedel))
+ 						g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
  
 -					camel_folder_free_message_info (m->folder, looking_info);
 -				}
 +				if (!was_deleted || (was_deleted && !m->hidedel))
 +					g_ptr_array_add (uids, (gpointer) camel_pstring_strdup (looking_for));
  			}
  		}
  	}
diff --cc po/ChangeLog
index 7c51fcc,288d650..0a5f095
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@@ -1,979 -1,1362 +1,4 @@@
  2008-07-09  Jorge Gonzalez  <jorgegonz svn gnome org>
- 2009-02-14  Gabor Kelemen  <kelemeng gnome hu>
- 
- 	* hu.po: Translation updated.
- 
- 2009-02-12  Sweta Kothari  <swkothar redhat com>
- 
- 	* gu.po: Committed Gujarati Translation.
- 
- 2009-02-12  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
- 
- 	* eu.po: Updated Basque translation.
- 
- 2009-02-11  Jonh Wendell  <jwendell gnome org>
- 
- 	* pt_BR.po: Updated Brazilian Portuguese translation by Andre Gondim.
- 
- 2009-02-10  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2009-02-09  Gil Forcada  <gforcada gnome org>
- 
- 	* ca.po: Updated Catalan translation by David Planella.
- 
- 2009-02-07  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2009-02-06  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-02-06    Clytie Siddall <clytie riverland net au>
- 
- 	* vi.po    Updated Vietnamese translation
- 
- 2009-02-05  Sweta Kothari  <swkothar redhat com>
- 
- 	* gu.po: Committed Gujarati Translation.
- 
- 2009-02-04  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
- 
- 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
- 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
- 
- 2009-02-03  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-31  Gabor Kelemen  <kelemeng gnome hu>
- 
- 	* hu.po: Translation updated.
- 
- 2009-01-31  Daniel Nylander <po danielnylander se>
- 
- 	* sv.po: Updated Swedish translation.
- 
- 2009-01-30  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-30  Nguy�n Thái Ng�c Duy <pclouds gmail com>
- 
- 	* vi.po: Don't translate the gconf keys, #569508
- 
- 2009-01-30  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2009-01-29  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Don't translate the gconf keys. Closes
- 	bug #569528
- 
- 2009-01-29  Jonh Wendell  <jwendell gnome org>
- 
- 	* pt_BR.po: Updated Brazilian Portuguese translation.
- 
- 2009-01-29  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2009-01-29  Bharath Acharya  <abharath novell com>
- 
- 	* POTFILES.in: Added plugins/pst-import/pst-importer.c
- 
- 2009-01-29  Raivis Dejus  <orvils gmail com>
- 
- 	* lv.po: Updated latvian translation Bug 569534
- 	
- 2009-01-29  I. Felix <ifelix redhat com>
- 
- 	* ta.po:  Bug fix for #569517.
- 
- 2009-01-29  Jovan Naumovski  <jovan lugola net>
- 
- 	* mk.po: Bug fix for #569526.
- 
- 2009-01-28  Goran RakiÄ?  <grakic devbase net>
- 
- 	* sr.po, sr latin po: Updated Serbian Translations (by MiloÅ¡ PopoviÄ?).
- 
- 2009-01-29  Funda Wang  <fundawang gmail com>
- 
- 	* zh_CN.po: Updated zh_CN translation.
- 
- 2009-01-28  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2009-01-24  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
- 2009-01-24  Changwoo Ryu  <cwryu debian org>
- 
- 	* ko.po: Updated Korean translation.
- 
- 2009-01-23  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation.
- 
- 2009-01-22  Wadim Dziedzic  <wdziedzic aviary pl>
- 
- 	* pl.po: Fixed bug 567778 in Polish translation
- 
- 2009-01-19  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-19  Yair Hershkovitz  <yairhr gmail com>
- 
- 	* he.po: Updated Hebrew translaion.
- 
- 2009-01-18 Nickolay V. Shmyrev  <nshmyrev yandex ru>
- 
- 	* ru.po: Updated Russian translation.
- 
- 2009-01-17  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-16  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation, fix #566570.
- 
- 2009-01-16  Gil Forcada  <gforcada gnome org>
- 
- 	* ca.po: Updated Catalan translation by David Planella.
- 
- 2009-01-15  Bharath Acharya  <abharath novell com>
- 
- 	* POTFILES.in: Added plugins/pst-import/org-gnome-pst-import.eplug.xml
- 
- 2009-01-14  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-14  Wadim Dziedzic  <wdziedzic aviary pl>
- 
- 	* pl.po: Updated Polish translation
- 
- 2009-01-12  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
- 2009-01-11  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-11  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
- 2009-01-10  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.  
- 
- 2009-01-07  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-05  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2009-01-04  Raivis Dejus  <orvils gmail com>
- 
- 	* lv.po: Updated latvian translation
- 
- 2009-01-02  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2009-01-01  Yannig Marchegay  <yannig marchegay org>
- 
- 	* oc.po: Updated Occitan translation
- 
- 2009-01-01  Andre Klapper  <a9016009 gmx de>
- 
- 	* POTFILES.in: Fix my last commit so l10n.gnome.org is happy.
- 
- 2008-12-30  Andre Klapper  <a9016009 gmx de>
- 
- 	* POTFILES.in: add missing file (cf. bug #359010)
- 
- 2008-12-28  Marcel Telka  <marcel telka sk>
- 
- 	* sk.po: Updated Slovak translation.
- 
- 2008-12-21  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
- 
- 2008-12-18  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2008-12-16  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2008-12-15  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* POTFILES.in: Remove deleted file.
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-12-15  Srinivasa Ragavan  <sragavan novell com>
- 
- 	* POTFILES.in: Add e-utils/*intrusive*.[ch]
- 
- 2008-12-13  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Merged from branch gnome-2-24 minor fixes to the Brazilian
- 	Portuguese translation.
- 
- 2008-12-09  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-11-26  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation.
- 
- 2008-11-16  Nickolay V. Shmyrev  <nshmyrev yandex ru>
- 
- 	* ru.po: Updated Russian translation.
- 
- 2008-11-14  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation. 
- 
- 2008-11-09  Petr Kovar  <pknbe volny cz>
- 
- 	* cs.po: Fixed Czech translation by Jiri Eischmann,
- 	thanks to Kamil Paral.
- 
- 2008-11-08  Jorge Gonzalez  <jorgegonz svn gnome org>   
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-11-03  Srinivasa Ragavan  <sragavan novell com>
- 
- 	* POTFILES.in: Added addressbook/gui/component/autocompletion-config.c
- 
- 2008-11-03 Maxim Dziumanenko <dziumanenko gmail com>
- 
- 	* uk.po: Update Ukrainian translation.
- 
- 2008-11-03  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Merged Brazilian Portuguese translation from branch
- 	gnome-2-24. Fixes capitalization, verb tense in descriptions, some
- 	terminology errors, double spaces and random errors. Improves 
- 	access keys.
- 
- 2008-11-02  Gabor Kelemen  <kelemeng gnome hu>
- 
- 	* hu.po: Translation updated.
- 
- 2008-10-30 Kenneth Nielsen <k nielsen81 gmail com>
- 
- 	* da.po: Updated Danish translation by Kenneth Nielsen
- 
- 2008-10-25  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-10-24  Daniel Nylander <po danielnylander se>
- 
- 	* sv.po: Updated Swedish translation.
- 
- 2008-10-23  Gil Forcada  <gforcada gnome org>
- 
- 	* LINGUAS: Added ast.
- 	* ast.po: Added Asturian translation on behalf of Mikel González.
- 
- 2008-10-23  Philipp Kerling  <k philipp gmail com>
- 
- 	** Fixes bug #557563
- 
- 	* de.po: Updated German translation (patch by Ronny Standke).
- 
- 2008-10-19  Theppitak Karoonboonyanan  <thep linux thai net>
- 
- 	* th.po: Updated Thai translation.
- 
- 2008-10-17  Marcel Telka  <marcel telka sk>
- 
- 	* sk.po: Updated Slovak translation.
- 
- 2008-10-17  Jorge Gonzalez  <jorgegonz svn gnome org>   
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-10-13  Matthew Barnes  <mbarnes redhat com>
- 
- 	** Fixes bug #556191
- 
- 	* POTFILES.in: Remove org-gnome-mark-calendar-offline.eplug.xml
- 
- 2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Fixed typo in the Brazilian Portuguese translation.
- 
- 2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Merged from branch gnome-2-24.
- 
- 2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
- 
- 2008-10-11  Marcel Telka  <marcel telka sk>
- 
- 	* sk.po: Updated Slovak translation.
- 
- 2008-10-10  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation, fixes bug #554832
- 
- 2008-10-04  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation.
- 
- 2008-10-04  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-10-03  Marcel Telka  <marcel telka sk>
- 
- 	* sk.po: Updated Slovak translation.
- 
- 2008-10-01 Og Maciel <ogmaciel gnome org>
- 
- 	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
- 
- 2008-10-01  Robert-André Mauchin  <zebob m pengzone org>
- 
- 	* fr.po: French translation update. Fixed #554548 
- 	thanks to Hanka Zalska from Sun.
- 
- 2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-09-30  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-09-30  Alexander Shopov  <ash contact bg>
- 
- 	* bg.po: Updated Bulgarian translation by
- 	Alexander Shopov <ash contact bg>
- 
- 2008-09-30  Alexander Shopov  <ash contact bg>
- 
- 	* bg.po: Updated Bulgarian translation by
- 	Alexander Shopov <ash contact bg>
- 
- 2008-09-29  Wouter Bolsterlee  <wbolster svn gnome org>
- 
- 	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
- 
- 2008-09-28  Goran RakiÄ?  <grakic devbase net>
- 
- 	* sr.po, sr latin po: Updated Serbian Translations.
- 
- 2008-09-22  Praveen Arimbrathodiyil <pravi a gmail com>
- 
- 	* ml.po: Malayalam translation updated by Hari Vishnu.
- 
- 2008-09-22  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-09-22  Runa Bhattacharjee  <runab redhat com>
- 
- 	* bn_IN.po: Updated Bengali India Translation
- 
- 2008-09-21  Nickolay V. Shmyrev  <nshmyrev yandex ru>
- 
- 	* ru.po: Updated Russian translation.
- 
- 2008-09-21  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-09-21  Wadim Dziedzic  <wdziedzic aviary pl>
- 
- 	* pl.po: Updated Polish translation
- 
- 2008-09-21  Djihed Afifi <djihed gmail com> 
- 
- 	* ar.po: Updated Arabic Translation by OsamaKhalid.
- 
- 2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
- 
-         * hi.po: Updated Hindi Translation.
-         
- 2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
- 
-         * hi.po: Updated Hindi Translation.
-         
- 2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
- 
-         * hi.po: Updated Hindi Translation.
- 
- 2008-09-21  Gabor Kelemen  <kelemeng gnome hu>
- 
- 	* hu.po: Translation updated.
- 
- 2008-09-20 Kenneth Nielsen <k nielsen81 gmail com>
- 
- 	* da.po: Updated Danish translation by Kenneth Nielsen
- 
- 2008-09-20  Luca Ferretti  <elle uca libero it>
- 
- 	* it.po: Updated Italian translation.
- 
- 2008-09-20  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Updated Brazilian Portuguese translation by Fabrício Godoy,
- 	Vladimir Melo and Leonardo Ferreira Fontenelle.
- 
- 2008-09-20  Laurent Dhima  <laurenti alblinux net>
- 
- 	* sq.po: Updated Albanian Translation.
- 
- 2008-09-20  Goran RakiÄ?  <grakic devbase net>
- 
- 	* sr.po, sr latin po: Updated Serbian translation (by Igor NestoroviÄ?).
- 
- 2008-09-19  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation.
- 
- 2008-09-19  Simos Xenitellis  <simos gnome org>
- 
- 	* el.po: Updated Greek translation by Pierros Papadeas.
- 
- 2008-09-19  Žygimantas BeruÄ?ka  <zygis gnome org>
- 
- 	* lt.po: Updated missing translations of msgctx strings.
- 
- 2008-09-19  Žygimantas BeruÄ?ka  <zygis gnome org>
- 
- 	* lt.po: Updated Lithuanian translation.
- 
- 2008-09-18  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation.
- 
- 2008-09-18  I. Felix <ifelix redhat com>
- 
- 	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
- 
- 2008-09-18 Inaki Larrañaga Murgoitio  <dooteo euskalgnu org>
- 
- 	* eu.po: Updated Basque translation.
- 
- 2008-09-18  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-09-18  Shankar Prasad  <svenkate redhat com>
- 
-         * kn.po: Updated Kannada translation
- 
- 2008-09-18  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
- 
- 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
- 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
- 
- 2008-09-18  Djihed Afifi <djihed gmail com> 
- 
- 	* ar.po: Updated Arabic Translation by Usama Akkad.
- 
- 2008-09-17  Djihed Afifi <djihed gmail com> 
- 
- 	* ar.po: Updated Arabic Translation by Usama Akkad.
- 
- 2008-09-17  Petr Kovar  <pknbe volny cz>
- 
- 	* cs.po: Updated Czech translation by Jiri Eischmann.
- 
- 2008-09-17  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-09-17  Shankar Prasad  <svenkate redhat com>
- 
-         * kn.po: Updated Kannada translation
- 
- 2008-09-16  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-09-16  Luca Ferretti  <elle uca libero it>
- 
- 	* it.po: Updated Italian translation.
- 
- 2008-09-16  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-09-15  Gil Forcada  <gforcada gnome org>
- 
- 	* ca.po: Updated Catalan translation by David Planella.
- 
- 2008-09-15  Petr Kovar  <pknbe volny cz>
- 
- 	* cs.po: Updated Czech translation by Jiri Eischmann.
- 
- 2008-09-15  Wouter Bolsterlee  <wbolster svn gnome org>
- 
- 	* nl.po: Updated Dutch translation by Tino Meinen.
- 
- 2008-09-15  Djihed Afifi <djihed gmail com>
- 
- 	* ar.po: Updated Arabic Translation by Abou Manal.
- 
- 2008-09-15  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada translation
- 
- 2008-09-14  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-09-14  Sandeep Shedmake  <sshedmak redhat com>
- 
- 	* mr.po: Updated Marathi translations.
- 
- 2008-09-13  Daniel Nylander <po danielnylander se>
- 
- 	* sv.po: Updated Swedish translation.
- 
- 2008-09-12  Baris Cicek  <baris teamforce name tr>
- 
- 	* tr.po: Updated Turkish translation.
- 
- 2008-09-12  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation.
- 
- 2008-09-12  Philip Withnall  <philip tecnocode co uk>
- 
- 	* en_GB.po: Updated British English translation.
- 
- 2008-09-12  Duarte Loreto <happyguy_pt hotmail com>
- 
- 	* pt.po: Fixed Portuguese terminology.
- 
- 2008-09-12  Daniel Nylander <po danielnylander se>
- 
- 	* sv.po: Updated Swedish translation.
- 
- 2008-09-11  Runa Bhattacharjee  <runab redhat com>
- 
- 	* bn_IN.po: Updated Bengali India Translation
- 
- 2008-09-11  Luca Ferretti  <elle uca libero it>
- 
- 	* it.po: Updated Italian translation.
- 
- 2008-09-11  Rajesh Ranjan <rajeshkajha yahoo com>
- 
- 	* hi.po: Updated Hindi Translation.
- 
- 2008-09-11  Robert Sedak  <robert sedak sk t-com hr>
- 
- 	* hr.po: Updated Croatian translation.
- 
- 2008-09-11  Gil Forcada  <gforcada gnme org>
- 
- 	* ca.po: Updated Catalan translation by David Planella.
- 
- 2008-09-10  Alexander Shopov  <ash contact bg>
- 
- 	* bg.po: Updated Bulgarian translation by
- 	Yavor Doganov <yavor gnu org>
- 
- 2008-09-10  Theppitak Karoonboonyanan  <thep linux thai net>
- 
- 	* th.po: Updated Thai translation.
- 
- 2008-09-09  Krishnababu K  <kkrothap redhat com>
- 
- 	* te.po: Updated Telugu Translation.
- 
- 2008-09-09  Pema Geyleg  <pema geyleg gmail com>
- 
- 	* dz.po: Updated Dzongkha Translation
- 
- 2008-09-09  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
- 
- 	* eu.po: Updated Basque translation.
- 
- 2008-09-08  Robert Sedak  <robert sedak sk t-com hr>
- 
- 	* hr.po: Updated Croatian translation.
- 
- 2008-09-08  I. Felix <ifelix redhat com>
- 
- 	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
- 
- 2008-09-07  Robert Sedak  <robert sedak sk t-com hr>
- 
- 	* hr.po: Updated Croatian translation.
- 
- 2008-09-07  Vincent van Adrighem  <adrighem gnome org>
- 
- 	* nl.po: Translation updated by Tino Meinen.
- 
- 2008-09-07  Duarte Loreto <happyguy_pt hotmail com>
- 
- 	* pt.po: Updated Portuguese translation.
- 
- 2008-09-07  Funda Wang  <fundawang gmail com>
- 
- 	* zh_CN.po: Updated zh_CN translation.
- 
- 2008-09-07  Philip Withnall  <philip tecnocode co uk>
- 
- 	* en_GB.po: Updated British English translation.
- 
- 2008-09-06  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
- 2008-09-06  Claude Paroz  <claude 2xlibre net>
- 
- 	* fr.po: Updated French translation.
- 
- 2008-09-05  Alexander Shopov  <ash contact bg>
- 
- 	* bg.po: Updated Bulgarian translation by
- 	Alexander Shopov <ash contact bg>
- 
- 2008-09-05  Theppitak Karoonboonyanan  <thep linux thai net>
- 
- 	* th.po: Updated Thai translation.
- 
- 2008-09-05  Changwoo Ryu  <cwryu debian org>
- 
- 	* ko.po: Updated Korean translation.
- 
- 2008-09-03  Philip Withnall  <philip tecnocode co uk>
- 
- 	* en_GB.po: Updated British English translation.
- 
- 2008-08-31  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-08-31  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-31  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-31  Yair Hershkovitz  <yairhr gmail com>
- 
- 	* he.po: Updated Hebrew translaion by Mark Krapivner.
- 
- 2008-08-30  Claude Paroz  <claude 2xlibre net>
- 
- 	* fr.po: Updated French translation by Yannick Tailliez and Bruno Brouard.
- 
- 2008-08-30  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
- 2008-08-30  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-30  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-30  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
- 
- 	* eu.po: Updated Basque translation.
- 
- 2008-08-29  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-29  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-08-28  Hendrik Richter  <hendrikr gnome org>
- 
- 	* de.po: Updated German translation, fix #545473.
- 
- 2008-08-27  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-08-27  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-08-25  Daniel Nylander <po danielnylander se>
- 
- 	* sv.po: Updated Swedish translation.
- 
- 2008-08-25  Goran Rakic  <grakic devbase net>
- 
- 	* LINGUAS, sr latin po, sr Latn po: Conversion from sr Latn to sr latin 
- 
- 2008-08-25  Goran RakiÄ?  <grakic devbase net>
- 
- 	* sr.po, sr Latn po: Updated Serbian translation
- 
- 2008-08-22  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-22  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada translation
- 
- 2008-08-22  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
- 
- 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
- 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
- 
- 2008-08-22  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
- 
- 	* eu.po: Updated Basque translation.
- 
- 2008-08-22  �smund Skjæveland  <aasmunds ulrik uio no>
- 
- 	* nn.po: Updated Norwegian Nynorsk translation.
- 
- 2008-08-21  Jovan Naumovski  <jovan lugola net>
- 
- 	* mk.po: Updated Macedonian translation.
- 
- 2008-08-21  �smund Skjæveland  <aasmunds ulrik uio no>
- 
- 	* nn.po: Updated Norwegian Nynorsk translation.
- 
- 2008-08-21  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada translation
- 
- 2008-08-18  Theppitak Karoonboonyanan  <thep linux thai net>
- 
- 	* th.po: Updated Thai translation.
- 
- 2008-08-18  Yair Hershkovitz  <yairhr gmail com>
- 
- 	* he.po: Updated Hebrew translaion.
- 
- 2008-08-18  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada translation
- 
- 2008-08-17  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-17  Takeshi AIHANA <takeshi aihana gmail com>
- 
- 	* ja.po: Updated Japanese translation.
- 
- 2008-08-16  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-08-15  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-15  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-08-15  Milan Crha  <mcrha redhat com>
- 
- 	* POTFILES.in: Added e-util/e-util.c there.
- 
- 2008-08-14  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada Translation.
- 
- 2008-08-13  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-08-13  Shankar Prasad  <svenkate redhat com>
- 
- 	* kn.po: Updated Kannada Translation.
- 
- 2008-08-12  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-12  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-12  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-12  Ilkka Tuohela <hile iki fi>
- 
- 	* fi.po: Updated Finnish translation.
- 
- 2008-08-11  Duarte Loreto <happyguy_pt hotmail com>
- 
- 	* pt.po: Updated Portuguese translation.
- 
- 2008-08-11  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-09  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
- 
- 	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
- 	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
- 
- 2008-08-08  Priit Laes  <plaes at svn dot gnome dot org>
- 
- 	* et.po: Translation updated by Ivar Smolin
- 
- 2008-08-07  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-07  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-06  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-08-06  Djihed Afifi <djihed gmail com>
- 
- 	* ar.po: Updated Arabic Translation by Abou Manal.
- 
- 2008-08-05: Sweta Kothari  <swkothar redhat com>
- 
- 	* gu.po: Committed Gujarati Translation.
- 
- 2008-08-04  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-03  Leonid Kanter <leon asplinux ru>
- 
- 	* ru.po: Updated Russian translation
- 
- 2008-08-02  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-01  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-08-01  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician translation
- 
- 2008-07-31  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
- 
- 2008-07-29  Kjartan Maraas  <kmaraas gnome org>
- 
- 	* nb.po: Updated Norwegian bokmål translation.
- 
- 2008-07-29  Changwoo Ryu  <cwryu debian org>
- 
- 	* ko.po: Updated Korean translation.
- 
- 2008-07-29  Djihed Afifi <djihed gmail com>
- 
- 	* ar.po: Updated Arabic Translation by Abou Manal.
- 
- 2008-07-27  Petr Kovar  <pknbe volny cz>
- 
- 	* cs.po: Fixed Czech translation.
- 
- 2008-07-24  Leonardo Ferreira Fontenelle  <leonardof gnome org>
- 
- 	* pt_BR.po: Terminology fixes by Fabrício Godoy.
- 
- 2008-06-24  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-07-24  Claude Paroz  <claude 2xlibre net>
- 
- 	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
- 
- 2008-07-23  Gil Forcada  <gforcada gnome org>
- 
- 	* ps.po: Added Pashto translation by Zabeeh Khan.
- 	* LINGUAS: Added ps.
- 
- 2008-07-23  Petr Kovar  <pknbe volny cz>
- 
- 	* cs.po: Fixed Czech translation, thanks for noticing
- 	to Pavel Sefranek.
- 
- 2008-07-21  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-07-21  Ignacio Casal Quinteiro  <nacho resa gmail com>
- 
- 	* gl.po: Updated Galician Translation.
- 
- 2008-07-21  Johnny Jacob  <jjohnny novell com>
- 
- 	* POTFILES.in: Fixed a typo.
- 
- 2008-07-21  J0hnny Jacob <jjohnny novell com>
- 
- 	* POTFILES.in: Updated file lsit.
- 
- 2008-07-20  Andre Klapper  <a9016009 gmx de>
- 
- 	* POTFILES.in: Updated file list.
- 
- 2008-07-20  Bharath Acharya  <abharath novell com>
- 
- 	* POTFILES.in:
- 	Updated file-list for templates plugin.
- 
- 	** See bug #200147
- 
- 2008-07-20  Jorge Gonzalez  <jorgegonz svn gnome org>
- 
- 	* es.po: Updated Spanish translation
- 
- 2008-07-19  Andre Klapper  <a9016009 gmx de>
- 
- 	* de.po: Updated German translation.
- 
 -2009-04-24  Milan Crha  <mcrha redhat com>
 -
 -	** Part of fix for bug #340783
 -
 -	* POTFILES.in: Added plugins/publish-calendar/publish-format-fb.c
 -	and plugins/publish-calendar/publish-format-ical.c there.
 -
 -2009-04-15  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Fixed bug #574842.
 -
 -2009-04-14  Khaled Hosny <khaledhosny eglug org>
 -
 -	* ar.po: Don't translate gconf key values, fixes #569507.
 -
 -2009-04-13  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2009-04-12  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2009-04-10 Baris Cicek <baris teamforce name tr>
 -
 -	* tr.po: Updated Turkish translation
 -	
 -2009-04-10  Goran Rakic  <grakic devbase net>
 -
 -	* sr.po, sr latin po: Updated Serbian translation (by MiloÅ¡ PopoviÄ?).
 -
 -2009-04-09  Shankar Prasad  <svenkate redhat com>
 -
 -        * kn.po: Updated Kannada translation
 -
 -2009-04-07  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Fix for British English date formats by Bruce Cowan
 -	<bcowan fastmail co uk>.
 -
 -2009-04-04  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-03-30  Manioj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation
 -
 -2009-03-27  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Mattias Põldaru
 -
 -2009-03-25  Shankar Prasad  <svenkate redhat com>
 -
 -        * kn.po: Updated few correction to Kannada translations.
 -
 -2009-03-22  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-03-21  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Typo fixed in French translation.
 -
 -2009-03-21  Takeshi AIHANA <takeshi aihana gmail com>
 -
 -	* ja.po: Fixed wrong translation.
 -
 -2009-03-19  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -2009-03-18  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic translation by Osama Khalid.
 -
 -2009-03-17  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2009-03-16  Baris Cicek <baris teamforce name tr>
 -
 -	* tr.po: Updated Turkish translation.
 -
 -2009-03-16  Alexander Shopov  <ash contact bg>
 -
 -	* bg.po: Updated Bulgarian translation by
 -	Alexander Shopov <ash contact bg>
 -
 -2009-03-16  Amitakhya Phukan <amitakhya svn gnome org>
 -
 -	* as.po: Updated Assamese translations.
 -
 -2009-03-16  Ankitkumar Patel  <ankit redhat com>
 -
 -	* gu.po: Updated Gujarati Translations.
 -
 -2009-03-16  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -<<<<<<< .mine
 -2009-03-16  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -=======
 -2009-03-16  Dwayne Bailey  <dwayne translate org za>
 -
 -	* af.po: Fix msgfmt errors
 -
 -2009-03-15  Andre Klapper  <a9016009 gmx de>
 -
 -	* af.po: Added Afrikaans translation by Friedel Wolff.
 -	Fixes bug #575466.
 -	* LINGUAS: Added af.
 -
 ->>>>>>> .r37444
 -2009-03-15  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2009-03-15  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation, fix #574975.
 -
 -2009-03-15  Nickolay V. Shmyrev  <nshmyrev yandex ru>
 -
 -	* ru.po: Updated Russian translation by Yuriy Penkin.
 -
 -2009-03-15  Ani Peter  <apeter redhat com>
 -
 -	* ml.po: Updated Malayalam Translations
 -
 -2009-03-15  Rajesh Ranjan  <rajeshkajha yahoo com>
 -
 -	* mai.po: added Maithili translation.
 -	* LINGUAS: Added Maithili (mai) to the list of Languages.
 -
 -2009-03-15  Sandeep Shedmake  <sshedmak redhat com>
 -
 -	* mr.po: Updated Marathi Translations.
 -
 -2009-03-15  Kostas Papadimas <pkst gnome org>
 -
 -	* el.po: Updated Greek Translation by Jennie Petoumenou.
 -
 -2009-03-14  Žygimantas BeruÄ?ka  <zygis gnome org>
 -
 -	* lt.po: Updated Lithuanian translation.
 -
 -2009-03-14  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -2009-03-14  Andre Klapper  <a9016009 gmx de>
 -
 -	* cs.po: Updated Czech translation by Jiri Eischmann.
 -
 -2009-03-14  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Priit Laes
 -
 -2009-03-14  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2009-03-14  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -	
 -2009-03-14  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Fixed bug #567745.
 -
 -2009-03-13  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	 * gl.po: Updated Galician translation
 -
 -2009-03-13  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -2009-03-13  I. Felix <ifelix redhat com>
 -
 -	* ta.po:  Tamil Translation updated
 -
 -2009-03-13  Rajesh Ranjan <rranjan redhat com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2009-03-13  Ani Peter  <apeter redhat com>
 -
 -	* ml.po: Updated Malayalam Translations
 -
 -2009-03-12  Wadim Dziedzic  <wdziedzic aviary pl>
 -
 -	* pl.po: Updated Polish translation and fixed bug #569514
 -
 -2009-03-13  Rajesh Ranjan <rranjan redhat com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2009-03-13  Runa Bhattacharjee  <runab redhat com>
 -
 -	* bn_IN.po: Updated partial Bengali India translation
 -
 -2009-03-12  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation
 -
 -2009-03-11  Goran Rakic  <grakic devbase net>
 -
 -	* sr.po, sr latin po: Updated Serbian translation wrt #574841.
 -
 -2009-03-11  Gintautas Miliauskas  <gintas akl lt>
 -
 -	* lt.po: Updated Lithuanian translation.
 -
 -2009-03-10  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-03-10  Ankitkumar Patel  <ankit redhat com>
 -
 -	* gu.po: Updated Gujarati Translations.
 -
 -2009-03-10  Rajesh Ranjan <rranjan redhat com>
 -
 -	* hi.po: Updated Hindi Translation.
 -	
 -2009-03-09  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation
 -
 -2009-03-09  Wouter Bolsterlee  <wbolster svn gnome org>
 -
 -	* nl.po: Updated Dutch translation by Tino Meinen.
 -
 -2009-03-08  Kostas Papadimas <pkst gnome org>
 -
 -	* el.po: Updated Greek Translation by Jennie Petoumenou.
 -
 -2009-03-08  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Updated British English translation.
 -
 -2009-03-08  Takeshi AIHANA <takeshi aihana gmail com>
 -
 -	* ja.po: Fixed wrong translations.
 -
 -2009-03-08  Gintautas Miliauskas  <gintas akl lt>
 -
 -	* lt.po: Updated Lithuanian translation.
 -
 -2009-03-07  MiÈ?u Moldovan <dumol gnome ro>
 -
 -	* ro.po: Updated Romanian translation by Adi Roiban
 -
 -2009-03-05  Krishnababu K <kkrothap redhat com>
 -
 -	* te.po: Updated Telugu Translation.
 -
 -2009-03-05  Duarte Loreto <happyguy_pt hotmail com>
 -
 -	* pt.po: Updated Portuguese translation.
 -
 -2009-03-04  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -2009-03-03  Milo Casagrande  <milo ubuntu com>
 -
 -	* it.po: Updated Italian translation
 -
 -2009-03-03  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Minor fix to Catalan translation.
 -
 -2009-03-03  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translations.
 -
 -2009-03-03  Žygimantas BeruÄ?ka  <zygis gnome org>
 -
 -	* lt.po: Updated Lithuanian translation.
 -
 -2009-03-02  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2009-03-02  Manoj Kumar Giri  <mgiri redhat com>
 -
 -	* or.po: Updated Oriya Translation.
 -
 -2009-03-02  Sweta Kothari  <swkothar redhat com>
 -
 -	* gu.po: Committed Gujarati Translation.
 -
 -2009-03-01  Wouter Bolsterlee  <wbolster svn gnome org>
 -
 -	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
 -
 -2009-03-01  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Mattias Põldaru
 -
 -2009-03-01  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2009-03-01  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2009-02-23  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Updated British English translation.
 -
 -2009-02-23  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Updated Catalan translation by David Planella.
 -
 -2009-02-20  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
 -
 -2009-02-20  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2009-02-19  Ihar Hrachyshka <booxter lacinka org>
 -
 -	* be latin po: Updated Belarusian Latin translation by Ihar
 -	Hrachyshka.
 -
 -2009-02-18  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2009-02-18  Ihar Hrachyshka <booxter lacinka org>
 -
 -	* be latin po: Updated Belarusian Latin translation by Ihar
 -	Hrachyshka.
 -
 -2009-02-18  Changwoo Ryu  <cwryu debian org>
 -
 -	* ko.po: Updated Korean translation.
 -
 -2009-02-17  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
 -
 -	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 -	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 -
 -2009-02-17  Takeshi AIHANA <takeshi aihana gmail com>
 -
 -	* ja.po: Updated Japanese translation.
 -
 -2009-02-16  Simos Xenitellis  <simos gnome org>
 -
 -	* el.po: Updated Greek translation (Marios Zindilis),
 -	closes bug 571886, bug 569519.
 -
 -2009-02-16  Sweta Kothari  <swkothar redhat com>
 -
 -	* gu.po: Committed Gujarati Translation.
 -
 -2009-02-15 Kenneth Nielsen <k nielsen81 gmail com>
 -
 -	* da.po: Updated Danish translation by Kenneth Nielsen
 -
 -2009-02-15  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Updated Czech translation by Jiri Eischmann.
 -
 -2009-02-14  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-02-14  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2009-02-12  Sweta Kothari  <swkothar redhat com>
 -
 -	* gu.po: Committed Gujarati Translation.
 -
 -2009-02-12  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
 -
 -	* eu.po: Updated Basque translation.
 -
 -2009-02-11  Jonh Wendell  <jwendell gnome org>
 -
 -	* pt_BR.po: Updated Brazilian Portuguese translation by Andre Gondim.
 -
 -2009-02-10  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2009-02-09  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Updated Catalan translation by David Planella.
 -
 -2009-02-07  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2009-02-06  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-02-06  Clytie Siddall <clytie riverland net au>
 -
 -	* vi.po: Updated Vietnamese translation
 -
 -2009-02-05  Sweta Kothari  <swkothar redhat com>
 -
 -	* gu.po: Committed Gujarati Translation.
 -
 -2009-02-04  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
 -
 -	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 -	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 -
 -2009-02-03  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-31  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2009-01-31  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2009-01-30  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-30  Nguy�n Thái Ng�c Duy <pclouds gmail com>
 -
 -	* vi.po: Don't translate the gconf keys, #569508
 -
 -2009-01-30  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2009-01-29  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Don't translate the gconf keys. Closes
 -	bug #569528
 -
 -2009-01-29  Jonh Wendell  <jwendell gnome org>
 -
 -	* pt_BR.po: Updated Brazilian Portuguese translation.
 -
 -2009-01-29  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2009-01-29  Bharath Acharya  <abharath novell com>
 -
 -	* POTFILES.in: Added plugins/pst-import/pst-importer.c
 -
 -2009-01-29  Raivis Dejus  <orvils gmail com>
 -
 -	* lv.po: Updated latvian translation Bug 569534
 -
 -2009-01-29  I. Felix <ifelix redhat com>
 -
 -	* ta.po:  Bug fix for #569517.
 -
 -2009-01-29  Jovan Naumovski  <jovan lugola net>
 -
 -	* mk.po: Bug fix for #569526.
 -
 -2009-01-28  Goran RakiÄ?  <grakic devbase net>
 -
 -	* sr.po, sr latin po: Updated Serbian Translations (by MiloÅ¡ PopoviÄ?).
 -
 -2009-01-29  Funda Wang  <fundawang gmail com>
 -
 -	* zh_CN.po: Updated zh_CN translation.
 -
 -2009-01-28  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2009-01-24  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2009-01-24  Changwoo Ryu  <cwryu debian org>
 -
 -	* ko.po: Updated Korean translation.
 -
 -2009-01-23  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation.
 -
 -2009-01-22  Wadim Dziedzic  <wdziedzic aviary pl>
 -
 -	* pl.po: Fixed bug 567778 in Polish translation
 -
 -2009-01-19  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-19  Yair Hershkovitz  <yairhr gmail com>
 -
 -	* he.po: Updated Hebrew translaion.
 -
 -2009-01-18 Nickolay V. Shmyrev  <nshmyrev yandex ru>
 -
 -	* ru.po: Updated Russian translation.
 -
 -2009-01-17  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-16  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation, fix #566570.
 -
 -2009-01-16  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Updated Catalan translation by David Planella.
 -
 -2009-01-15  Bharath Acharya  <abharath novell com>
 -
 -	* POTFILES.in: Added plugins/pst-import/org-gnome-pst-import.eplug.xml
 -
 -2009-01-14  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-14  Wadim Dziedzic  <wdziedzic aviary pl>
 -
 -	* pl.po: Updated Polish translation
 -
 -2009-01-12  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2009-01-11  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-11  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2009-01-10  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-07  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-05  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2009-01-04  Raivis Dejus  <orvils gmail com>
 -
 -	* lv.po: Updated latvian translation
 -
 -2009-01-02  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2009-01-01  Yannig Marchegay  <yannig marchegay org>
 -
 -	* oc.po: Updated Occitan translation
 -
 -2009-01-01  Andre Klapper  <a9016009 gmx de>
 -
 -	* POTFILES.in: Fix my last commit so l10n.gnome.org is happy.
 -
 -2008-12-30  Andre Klapper  <a9016009 gmx de>
 -
 -	* POTFILES.in: add missing file (cf. bug #359010)
 -
 -2008-12-28  Marcel Telka  <marcel telka sk>
 -
 -	* sk.po: Updated Slovak translation.
 -
 -2008-12-21  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
 -
 -2008-12-18  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2008-12-16  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2008-12-15  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* POTFILES.in: Remove deleted file.
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-12-15  Srinivasa Ragavan  <sragavan novell com>
 -
 -	* POTFILES.in: Add e-utils/*intrusive*.[ch]
 -
 -2008-12-13  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Merged from branch gnome-2-24 minor fixes to the Brazilian
 -	Portuguese translation.
 -
 -2008-12-09  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-11-26  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2008-11-16  Nickolay V. Shmyrev  <nshmyrev yandex ru>
 -
 -	* ru.po: Updated Russian translation.
 -
 -2008-11-14  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation.
 -
 -2008-11-09  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Fixed Czech translation by Jiri Eischmann,
 -	thanks to Kamil Paral.
 -
 -2008-11-08  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-11-03  Srinivasa Ragavan  <sragavan novell com>
 -
 -	* POTFILES.in: Added addressbook/gui/component/autocompletion-config.c
 -
 -2008-11-03 Maxim Dziumanenko <dziumanenko gmail com>
 -
 -	* uk.po: Update Ukrainian translation.
 -
 -2008-11-03  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Merged Brazilian Portuguese translation from branch
 -	gnome-2-24. Fixes capitalization, verb tense in descriptions, some
 -	terminology errors, double spaces and random errors. Improves
 -	access keys.
 -
 -2008-11-02  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2008-10-30 Kenneth Nielsen <k nielsen81 gmail com>
 -
 -	* da.po: Updated Danish translation by Kenneth Nielsen
 -
 -2008-10-25  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-10-24  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-10-24  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2008-10-23  Gil Forcada  <gforcada gnome org>
 -
 -	* LINGUAS: Added ast.
 -	* ast.po: Added Asturian translation on behalf of Mikel González.
 -
 -2008-10-23  Philipp Kerling  <k philipp gmail com>
 -
 -	** Fixes bug #557563
 -
 -	* de.po: Updated German translation (patch by Ronny Standke).
 -
 -2008-10-19  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2008-10-17  Marcel Telka  <marcel telka sk>
 -
 -	* sk.po: Updated Slovak translation.
 -
 -2008-10-17  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-10-13  Matthew Barnes  <mbarnes redhat com>
 -
 -	** Fixes bug #556191
 -
 -	* POTFILES.in: Remove org-gnome-mark-calendar-offline.eplug.xml
 -
 -2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Fixed typo in the Brazilian Portuguese translation.
 -
 -2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Merged from branch gnome-2-24.
 -
 -2008-10-11  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Fixed terminology in the Brazilian Portuguese translation.
 -
 -2008-10-11  Marcel Telka  <marcel telka sk>
 -
 -	* sk.po: Updated Slovak translation.
 -
 -2008-10-10  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation, fixes bug #554832
 -
 -2008-10-04  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation.
 -
 -2008-10-04  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-10-03  Marcel Telka  <marcel telka sk>
 -
 -	* sk.po: Updated Slovak translation.
 -
 -2008-10-01 Og Maciel <ogmaciel gnome org>
 -
 -	* pt_BR.po: Updated Brazilian Portuguese translation by Og Maciel.
 -
 -2008-10-01  Robert-André Mauchin  <zebob m pengzone org>
 -
 -	* fr.po: French translation update. Fixed #554548
 -	thanks to Hanka Zalska from Sun.
 -
 -2008-10-01  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-09-30  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-09-30  Alexander Shopov  <ash contact bg>
 -
 -	* bg.po: Updated Bulgarian translation by
 -	Alexander Shopov <ash contact bg>
 -
 -2008-09-30  Alexander Shopov  <ash contact bg>
 -
 -	* bg.po: Updated Bulgarian translation by
 -	Alexander Shopov <ash contact bg>
 -
 -2008-09-29  Wouter Bolsterlee  <wbolster svn gnome org>
 -
 -	* nl.po: Updated Dutch translation by Wouter Bolsterlee.
 -
 -2008-09-28  Goran RakiÄ?  <grakic devbase net>
 -
 -	* sr.po, sr latin po: Updated Serbian Translations.
 -
 -2008-09-22  Praveen Arimbrathodiyil <pravi a gmail com>
 -
 -	* ml.po: Malayalam translation updated by Hari Vishnu.
 -
 -2008-09-22  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-09-22  Runa Bhattacharjee  <runab redhat com>
 -
 -	* bn_IN.po: Updated Bengali India Translation
 -
 -2008-09-21  Nickolay V. Shmyrev  <nshmyrev yandex ru>
 -
 -	* ru.po: Updated Russian translation.
 -
 -2008-09-21  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-09-21  Wadim Dziedzic  <wdziedzic aviary pl>
 -
 -	* pl.po: Updated Polish translation
 -
 -2008-09-21  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by OsamaKhalid.
 -
 -2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2008-09-21  Rajesh Ranjan <rajeshkajha yahoo com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2008-09-21  Gabor Kelemen  <kelemeng gnome hu>
 -
 -	* hu.po: Translation updated.
 -
 -2008-09-20 Kenneth Nielsen <k nielsen81 gmail com>
 -
 -	* da.po: Updated Danish translation by Kenneth Nielsen
 -
 -2008-09-20  Luca Ferretti  <elle uca libero it>
 -
 -	* it.po: Updated Italian translation.
 -
 -2008-09-20  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Updated Brazilian Portuguese translation by Fabrício Godoy,
 -	Vladimir Melo and Leonardo Ferreira Fontenelle.
 -
 -2008-09-20  Laurent Dhima  <laurenti alblinux net>
 -
 -	* sq.po: Updated Albanian Translation.
 -
 -2008-09-20  Goran RakiÄ?  <grakic devbase net>
 -
 -	* sr.po, sr latin po: Updated Serbian translation (by Igor NestoroviÄ?).
 -
 -2008-09-19  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation.
 -
 -2008-09-19  Simos Xenitellis  <simos gnome org>
 -
 -	* el.po: Updated Greek translation by Pierros Papadeas.
 -
 -2008-09-19  Žygimantas BeruÄ?ka  <zygis gnome org>
 -
 -	* lt.po: Updated missing translations of msgctx strings.
 -
 -2008-09-19  Žygimantas BeruÄ?ka  <zygis gnome org>
 -
 -	* lt.po: Updated Lithuanian translation.
 -
 -2008-09-18  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation.
 -
 -2008-09-18  I. Felix <ifelix redhat com>
 -
 -	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
 -
 -2008-09-18 Inaki Larrañaga Murgoitio  <dooteo euskalgnu org>
 -
 -	* eu.po: Updated Basque translation.
 -
 -2008-09-18  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-09-18  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-09-18  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
 -
 -	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 -	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 -
 -2008-09-18  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by Usama Akkad.
 -
 -2008-09-17  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by Usama Akkad.
 -
 -2008-09-17  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Updated Czech translation by Jiri Eischmann.
 -
 -2008-09-17  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-09-17  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-09-16  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-09-16  Luca Ferretti  <elle uca libero it>
 -
 -	* it.po: Updated Italian translation.
 -
 -2008-09-16  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-09-15  Gil Forcada  <gforcada gnome org>
 -
 -	* ca.po: Updated Catalan translation by David Planella.
 -
 -2008-09-15  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Updated Czech translation by Jiri Eischmann.
 -
 -2008-09-15  Wouter Bolsterlee  <wbolster svn gnome org>
 -
 -	* nl.po: Updated Dutch translation by Tino Meinen.
 -
 -2008-09-15  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by Abou Manal.
 -
 -2008-09-15  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-09-14  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-09-14  Sandeep Shedmake  <sshedmak redhat com>
 -
 -	* mr.po: Updated Marathi translations.
 -
 -2008-09-13  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2008-09-12  Baris Cicek  <baris teamforce name tr>
 -
 -	* tr.po: Updated Turkish translation.
 -
 -2008-09-12  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation.
 -
 -2008-09-12  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Updated British English translation.
 -
 -2008-09-12  Duarte Loreto <happyguy_pt hotmail com>
 -
 -	* pt.po: Fixed Portuguese terminology.
 -
 -2008-09-12  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2008-09-11  Runa Bhattacharjee  <runab redhat com>
 -
 -	* bn_IN.po: Updated Bengali India Translation
 -
 -2008-09-11  Luca Ferretti  <elle uca libero it>
 -
 -	* it.po: Updated Italian translation.
 -
 -2008-09-11  Rajesh Ranjan <rajeshkajha yahoo com>
 -
 -	* hi.po: Updated Hindi Translation.
 -
 -2008-09-11  Robert Sedak  <robert sedak sk t-com hr>
 -
 -	* hr.po: Updated Croatian translation.
 -
 -2008-09-11  Gil Forcada  <gforcada gnme org>
 -
 -	* ca.po: Updated Catalan translation by David Planella.
 -
 -2008-09-10  Alexander Shopov  <ash contact bg>
 -
 -	* bg.po: Updated Bulgarian translation by
 -	Yavor Doganov <yavor gnu org>
 -
 -2008-09-10  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2008-09-09  Krishnababu K  <kkrothap redhat com>
 -
 -	* te.po: Updated Telugu Translation.
 -
 -2008-09-09  Pema Geyleg  <pema geyleg gmail com>
 -
 -	* dz.po: Updated Dzongkha Translation
 -
 -2008-09-09  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
 -
 -	* eu.po: Updated Basque translation.
 -
 -2008-09-08  Robert Sedak  <robert sedak sk t-com hr>
 -
 -	* hr.po: Updated Croatian translation.
 -
 -2008-09-08  I. Felix <ifelix redhat com>
 -
 -	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
 -
 -2008-09-07  Robert Sedak  <robert sedak sk t-com hr>
 -
 -	* hr.po: Updated Croatian translation.
 -
 -2008-09-07  Vincent van Adrighem  <adrighem gnome org>
 -
 -	* nl.po: Translation updated by Tino Meinen.
 -
 -2008-09-07  Duarte Loreto <happyguy_pt hotmail com>
 -
 -	* pt.po: Updated Portuguese translation.
 -
 -2008-09-07  Funda Wang  <fundawang gmail com>
 -
 -	* zh_CN.po: Updated zh_CN translation.
 -
 -2008-09-07  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Updated British English translation.
 -
 -2008-09-06  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2008-09-06  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Updated French translation.
 -
 -2008-09-05  Alexander Shopov  <ash contact bg>
 -
 -	* bg.po: Updated Bulgarian translation by
 -	Alexander Shopov <ash contact bg>
 -
 -2008-09-05  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2008-09-05  Changwoo Ryu  <cwryu debian org>
 -
 -	* ko.po: Updated Korean translation.
 -
 -2008-09-03  Philip Withnall  <philip tecnocode co uk>
 -
 -	* en_GB.po: Updated British English translation.
 -
 -2008-08-31  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-08-31  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-31  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-31  Yair Hershkovitz  <yairhr gmail com>
 -
 -	* he.po: Updated Hebrew translaion by Mark Krapivner.
 -
 -2008-08-30  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Updated French translation by Yannick Tailliez and Bruno Brouard.
 -
 -2008-08-30  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
 -2008-08-30  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-30  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-30  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
 -
 -	* eu.po: Updated Basque translation.
 -
 -2008-08-29  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-29  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-08-28  Hendrik Richter  <hendrikr gnome org>
 -
 -	* de.po: Updated German translation, fix #545473.
 -
 -2008-08-27  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-08-27  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-08-25  Daniel Nylander <po danielnylander se>
 -
 -	* sv.po: Updated Swedish translation.
 -
 -2008-08-25  Goran Rakic  <grakic devbase net>
 -
 -	* LINGUAS, sr latin po, sr Latn po: Conversion from sr Latn to sr latin 
 -
 -2008-08-25  Goran RakiÄ?  <grakic devbase net>
 -
 -	* sr.po, sr Latn po: Updated Serbian translation
 -
 -2008-08-22  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-22  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-08-22  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
 -
 -	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 -	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 -
 -2008-08-22  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
 -
 -	* eu.po: Updated Basque translation.
 -
 -2008-08-22  �smund Skjæveland  <aasmunds ulrik uio no>
 -
 -	* nn.po: Updated Norwegian Nynorsk translation.
 -
 -2008-08-21  Jovan Naumovski  <jovan lugola net>
 -
 -	* mk.po: Updated Macedonian translation.
 -
 -2008-08-21  �smund Skjæveland  <aasmunds ulrik uio no>
 -
 -	* nn.po: Updated Norwegian Nynorsk translation.
 -
 -2008-08-21  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-08-18  Theppitak Karoonboonyanan  <thep linux thai net>
 -
 -	* th.po: Updated Thai translation.
 -
 -2008-08-18  Yair Hershkovitz  <yairhr gmail com>
 -
 -	* he.po: Updated Hebrew translaion.
 -
 -2008-08-18  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada translation
 -
 -2008-08-17  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-17  Takeshi AIHANA <takeshi aihana gmail com>
 -
 -	* ja.po: Updated Japanese translation.
 -
 -2008-08-16  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-08-15  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-15  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-08-15  Milan Crha  <mcrha redhat com>
 -
 -	* POTFILES.in: Added e-util/e-util.c there.
 -
 -2008-08-14  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada Translation.
 -
 -2008-08-13  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-08-13  Shankar Prasad  <svenkate redhat com>
 -
 -	* kn.po: Updated Kannada Translation.
 -
 -2008-08-12  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-12  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-12  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-12  Ilkka Tuohela <hile iki fi>
 -
 -	* fi.po: Updated Finnish translation.
 -
 -2008-08-11  Duarte Loreto <happyguy_pt hotmail com>
 -
 -	* pt.po: Updated Portuguese translation.
 -
 -2008-08-11  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-09  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
 -
 -	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
 -	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
 -
 -2008-08-08  Priit Laes  <plaes at svn dot gnome dot org>
 -
 -	* et.po: Translation updated by Ivar Smolin
 -
 -2008-08-07  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-07  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-06  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-08-06  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by Abou Manal.
 -
 -2008-08-05: Sweta Kothari  <swkothar redhat com>
 -
 -	* gu.po: Committed Gujarati Translation.
 -
 -2008-08-04  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-03  Leonid Kanter <leon asplinux ru>
 -
 -	* ru.po: Updated Russian translation
 -
 -2008-08-02  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-01  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-08-01  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician translation
 -
 -2008-07-31  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician Translation by Frco. Javier Rial Rodríguez.
 -
 -2008-07-29  Kjartan Maraas  <kmaraas gnome org>
 -
 -	* nb.po: Updated Norwegian bokmål translation.
 -
 -2008-07-29  Changwoo Ryu  <cwryu debian org>
 -
 -	* ko.po: Updated Korean translation.
 -
 -2008-07-29  Djihed Afifi <djihed gmail com>
 -
 -	* ar.po: Updated Arabic Translation by Abou Manal.
 -
 -2008-07-27  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Fixed Czech translation.
 -
 -2008-07-24  Leonardo Ferreira Fontenelle  <leonardof gnome org>
 -
 -	* pt_BR.po: Terminology fixes by Fabrício Godoy.
 -
 -2008-06-24  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-07-24  Claude Paroz  <claude 2xlibre net>
 -
 -	* fr.po: Updated French translation by Bruno Brouard and Claude Paroz.
 -
 -2008-07-23  Gil Forcada  <gforcada gnome org>
 -
 -	* ps.po: Added Pashto translation by Zabeeh Khan.
 -	* LINGUAS: Added ps.
 -
 -2008-07-23  Petr Kovar  <pknbe volny cz>
 -
 -	* cs.po: Fixed Czech translation, thanks for noticing
 -	to Pavel Sefranek.
 -
 -2008-07-21  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-07-21  Ignacio Casal Quinteiro  <nacho resa gmail com>
 -
 -	* gl.po: Updated Galician Translation.
 -
 -2008-07-21  Johnny Jacob  <jjohnny novell com>
 -
 -	* POTFILES.in: Fixed a typo.
 -
 -2008-07-21  J0hnny Jacob <jjohnny novell com>
 -
 -	* POTFILES.in: Updated file lsit.
 -
 -2008-07-20  Andre Klapper  <a9016009 gmx de>
 -
 -	* POTFILES.in: Updated file list.
 -
 -2008-07-20  Bharath Acharya  <abharath novell com>
 -
 -	* POTFILES.in:
 -	Updated file-list for templates plugin.
 -
 -	** See bug #200147
 -
 -2008-07-20  Jorge Gonzalez  <jorgegonz svn gnome org>
 -
 -	* es.po: Updated Spanish translation
 -
 -2008-07-19  Andre Klapper  <a9016009 gmx de>
 -
 -	* de.po: Updated German translation.
 -
  
  	* es.po: Updated Spanish translation
  
@@@ -983,7 -1366,7 +8,7 @@@
  
  2008-07-05  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2008-07-04  Priit Laes  <plaes at svn dot gnome dot org>
  
@@@ -1040,11 -1423,11 +65,11 @@@
  
  	* ru.po: Updated Russian translation by Anatol Kamynin.
  
--2008-06-14  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-06-14  Jorge Gonzalez  <jorgegonz svn gnome org>  
  
  	* es.po: Updated Spanish translation
  
--2008-06-11  Djihed Afifi <djihed gmail com>
++2008-06-11  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Abou Manal.
  
@@@ -1064,11 -1447,11 +89,11 @@@
  
  	* he.po: Updated Hebrew translaion.
  
--2008-06-02  Clytie Siddall <clytie riverland net au>
++2008-06-02   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
--2008-06-01  Clytie Siddall <clytie riverland net au>
++2008-06-01   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
@@@ -1078,7 -1461,7 +103,7 @@@
  
  2008-05-23  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation, fixes bug #535014
++        * es.po: Updated Spanish translation, fixes bug #535014
  
  2008-05-25  Philip Withnall  <pwithnall svn gnome org>
  
@@@ -1088,7 -1471,7 +113,7 @@@
  
  	* en_GB.po: Updated British English translation.
  
--2008-05-25  Clytie Siddall <clytie riverland net au>
++2008-05-25   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
@@@ -1108,7 -1491,7 +133,7 @@@
  
  	* el.po: Fixed a typo.
  
--2008-05-23  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-05-23  Jorge Gonzalez  <jorgegonz svn gnome org>  
  
  	* es.po: Updated Spanish translation
  
@@@ -1121,7 -1504,7 +146,7 @@@
  
  	* nl.po: Translation updated by Tino Meinen.
  
--2008-05-19  Djihed Afifi <djihed gmail com>
++2008-05-19  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Abou Manal.
  
@@@ -1172,7 -1555,7 +197,7 @@@
  
  2008-04-27  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2008-04-26  Jorge Gonzalez  <jorgegonz svn gnome org>
  
@@@ -1187,7 -1570,7 +212,7 @@@
  
  	* en_GB.po: _Trash -> Wastebaske_t
  
--2008-04-20  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-04-20  Jorge Gonzalez  <jorgegonz svn gnome org>     
  
  	* es.po: Updated Spanish translation
  
@@@ -1226,9 -1609,9 +251,9 @@@
  
  	* he.po: Updated Hebrew translaion by Mark Krapivner.
  
--2008-04-12  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-04-12  Jorge Gonzalez  <jorgegonz svn gnome org>  
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2008-04-09  Yair Hershkovitz  <yairhr gmail com>
  
@@@ -1240,7 -1623,7 +265,7 @@@
  
  2008-04-07  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation, fixed bug #525068
++        * es.po: Updated Spanish translation, fixed bug #525068
  
  2008-04-07  Priit Laes  <plaes at svn dot gnome dot org>
  
@@@ -1348,12 -1731,12 +373,12 @@@
  
  2008-03-09  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
  
--	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
--	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
++        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
++        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
  
  2008-03-09 Maxim Dziumanenko <dziumanenko gmail com>
  
--	* uk.po: Update Ukrainian translation.
++        * uk.po: Update Ukrainian translation.
  
  2008-03-08  Kenneth Nielsen  <k nielsen81 gmail com>
  
@@@ -1364,7 -1747,7 +389,7 @@@
  	* el.po: Updated Greek translation
  
  2008-03-08  Guntupalli Karunakar  <karunakar indlinux org>
--
++	
  	* hi.po: Fix plurals.
  
  2008-03-08  Runa Bhattacharjee <runab fedoraproject org>
@@@ -1452,9 -1835,9 +477,9 @@@
  
  	* lt.po: Updated Lithuanian translation.
  
--2008-02-29  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-02-29  Jorge Gonzalez  <jorgegonz svn gnome org>  
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation                   
  
  2008-02-29  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
  
@@@ -1493,7 -1876,7 +518,7 @@@
  
  	* et.po: Translation updated by Ivar Smolin
  
--2008-02-23  Djihed Afifi <djihed gmail com>
++2008-02-23  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Abou Manal.
  
@@@ -1503,7 -1886,7 +528,7 @@@
  
  2008-02-21 Arangel Angov <arangel linux net mk>
  
--	* mk.po: Updated Macedonian translation.
++        * mk.po: Updated Macedonian translation.
  
  2008-02-21  Changwoo Ryu  <cwryu debian org>
  
@@@ -1520,15 -1903,15 +545,15 @@@
  2008-02-18  Jorge Gonzalez  <jorgegonz svn gnome org>
  
  	* es.po: Updated Spanish translaiton, fixed typo thanks to Ignacio
--	Casal Quinteiro.
++	  Casal Quinteiro.
  
  2008-02-19  Ignacio Casal Quinteiro  <nacho resa gmail com>
  
  	* gl.po: Updated Galician Translation.
  
--2008-02-18  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-02-18  Jorge Gonzalez  <jorgegonz svn gnome org>  
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2008-02-18  Nguy�n Thái Ng�c Duy <pclouds gmail com>
  
@@@ -1542,14 -1925,14 +567,14 @@@
  
  	* nb.po: Updated Norwegian bokmål translation.
  
--2008-02-17  Djihed Afifi <djihed gmail com>
++2008-02-17  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
  2008-02-17  David Lodge <dave cirt net>
  
  	* en_GB.po: Updated British English translation
--
++	
  2008-02-16  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
  
  	* eu.po: Updated Basque translation.
@@@ -1610,7 -1993,7 +635,7 @@@
  
  	* eu.po: Updated Basque translation.
  
--2008-02-11  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-02-11  Jorge Gonzalez  <jorgegonz svn gnome org> 
  
  	* es.po: Updated Spanish translation
  
@@@ -1649,9 -2032,9 +674,9 @@@
  	* de.po: Updated German translation.
  
  2008-02-02  Yannig Marchegay <yannig marchegay org>
--
++	
  	* oc.po: Updated Occitan translation.
--
++	
  2008-02-02  Kjartan Maraas  <kmaraas gnome org>
  
  	* nb.po: Updated Norwegian bokmål translation.
@@@ -1660,7 -2043,7 +685,7 @@@
  
  	* kn.po: Updated Kannada Translations by Shankar Prasad.
  
--2008-01-31  Djihed Afifi <djihed gmail com>
++2008-01-31  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
@@@ -1668,7 -2051,7 +693,7 @@@
  
  	* sv.po: Updated Swedish translation.
  
--2008-01-30  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-01-30  Jorge Gonzalez  <jorgegonz svn gnome org>       
  
  	* es.po: Updated Spanish translation
  
@@@ -1686,7 -2069,7 +711,7 @@@
  
  2008-01-28  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2008-01-28  Daniel Nylander <po danielnylander se>
  
@@@ -1698,7 -2081,7 +723,7 @@@
  
  2008-01-26  Ignacio Casal Quinteiro  <nacho resa gmail com>
  
--	* gl.po: Updated Galician Translation.
++        * gl.po: Updated Galician Translation.
  
  2008-01-26  Jorge Gonzalez  <jorgegonz svn gnome org>
  
@@@ -1815,19 -2198,19 +840,19 @@@
  
  	* POTFILES.in: Remove new-mail-notify's files.
  
--2008-01-09  Jorge Gonzalez  <jorgegonz svn gnome org>
++2008-01-09  Jorge Gonzalez  <jorgegonz svn gnome org>          
  
--	* es.po: Updated Spanish translation.
++	* es.po: Updated Spanish translation.  
  
  2008-01-05  Inaki Larranaga Murgoitio  <dooteo euskalgnu org>
  
--	* eu.po: Updated Basque translation.
++        * eu.po: Updated Basque translation.
  
  2008-01-04  Erdal Ronahi  <erdal ronahi gmail com>
  
  	* ku.po: Updated Kurdish translation
  
--2008-01-05  Clytie Siddall <clytie riverland net au>
++2008-01-05   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
@@@ -1855,7 -2238,7 +880,7 @@@
  
  	* ga.po: Updated Irish translation.
  
--2007-12-28  Djihed Afifi <djihed gmail com>
++2007-12-28  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
@@@ -1877,7 -2260,7 +902,7 @@@
  
  2007-12-17  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-12-17  Kjartan Maraas  <kmaraas gnome org>
  
@@@ -1893,7 -2276,7 +918,7 @@@
  
  2007-12-16  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-12-16  Leonardo Ferreira Fontenelle  <leonardof svn gnome org>
  
@@@ -1909,9 -2292,9 +934,9 @@@
  
  	* ga.po: Updated Irish translation.
  
--2007-12-15  Jorge Gonzalez  <jorgegonz svn gnome org>
++2007-12-15  Jorge Gonzalez  <jorgegonz svn gnome org> 
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-12-15  Kjartan Maraas  <kmaraas gnome org>
  
@@@ -1923,15 -2306,15 +948,15 @@@
  
  2007-12-11  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation.
++        * es.po: Updated Spanish translation.
  
  2007-12-10  Matej UrbanÄ?iÄ?  <mateju svn gnome org>
  
  	* sl.po: Updated Slovenian Translation.
  
--2007-12-09  Jorge Gonzalez  <jorgegonz svn gnome org>
++2007-12-09  Jorge Gonzalez  <jorgegonz svn gnome org> 
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-12-08  Andre Klapper  <a9016009 gmx de>
  
@@@ -1952,7 -2335,7 +977,7 @@@
  
  2007-12-06  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-12-04  Changwoo Ryu  <cwryu debian org>
  
@@@ -1962,9 -2345,9 +987,9 @@@
  
  	* POTFILES.in: Add new files, remove dead ones.
  
--2007-11-28  Jorge Gonzalez <jorgegonz svn gnome org>
++2007-11-28  Jorge Gonzalez <jorgegonz svn gnome org>  
  
--	* es.po: Updated Spanish translation.
++        * es.po: Updated Spanish translation.
  
  2007-11-28  Priit Laes  <plaes svn gnome org>
  
@@@ -1974,13 -2357,13 +999,13 @@@
  
  	* sl.po: Updated Slovenian translation.
  
--2007-11-21  Yannig Marchegay <yannig marchegay org>
++2007-11-21  Yannig Marchegay <yannig marchegay org> 
  
  	* oc.po: Updated Occitan translation
  
  2007-11-20  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-11-20  Daniel Nylander <po danielnylander se>
  
@@@ -1988,11 -2371,11 +1013,11 @@@
  
  2007-11-18  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation   
  
  2007-11-15  Marcel Telka  <marcel telka sk>
  
--	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska.
++	* sk.po: Fixed bug 422993. Thanks to Hanka Zalska. 
  
  2007-11-14  Daniel Nylander <po danielnylander se>
  
@@@ -2000,7 -2383,7 +1025,7 @@@
  
  2007-11-14  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-11-14  Andre Klapper  <a9016009 gmx de>
  
@@@ -2012,7 -2395,7 +1037,7 @@@
  
  2007-11-12  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-11-12  Matej UrbanÄ?iÄ?  <mateju svn gnome org>
  
@@@ -2047,7 -2430,7 +1072,7 @@@
  
  2007-11-01  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-11-01  Gil Forcada  <gforcada svn gnome org>
  
@@@ -2068,17 -2451,17 +1093,17 @@@
  
  2007-10-26  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation.
++        * es.po: Updated Spanish translation.
  
  2007-10-25  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation.
++        * es.po: Updated Spanish translation.                     
  
  2007-10-24  Matej UrbanÄ?iÄ?  <mateju svn gnome org>
  
  	* sl.po: Updated Slovenian translation.
  
--2007-10-23  Djihed Afifi <djihed gmail com>
++2007-10-23  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Anas Husseini.
  
@@@ -2090,7 -2473,7 +1115,7 @@@
  
  	* ca.po: Updated Catalan translation by David Planella.
  
--2007-10-21  Djihed Afifi <djihed gmail com>
++2007-10-21  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Anas Husseini.
  
@@@ -2098,9 -2481,9 +1123,9 @@@
  
  	* sl.po: Updated Slovenian translation.
  
--2007-10-16  Jorge Gonzalez  <jorgegonz svn gnome org>
++2007-10-16  Jorge Gonzalez  <jorgegonz svn gnome org> 
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-10-15  Alexander Shopov  <ash contact bg>
  
@@@ -2165,7 -2548,7 +1190,7 @@@
  
  2007-09-16  Yannig Marchegay <yannig marchegay org>
  
--	* oc/oc.po: Updated Occitan translation
++        * oc/oc.po: Updated Occitan translation
  
  2007-09-15  Nickolay V. Shmyrev  <nshmyrev yandex ru>
  
@@@ -2179,7 -2562,7 +1204,7 @@@
  
  	* cy.po: Fix typo in date format string
  
--2007-09-13  Djihed Afifi <djihed gmail com>
++2007-09-13  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Ahmad Farghal.
  
@@@ -2223,12 -2606,12 +1248,12 @@@
  2007-09-10  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation: fixes for
--	lots of typos (bug #475578)
++		 	 lots of typos (bug #475578)
  
  2007-09-10  Jorge Gonzalez  <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
--
++        * es.po: Updated Spanish translation
++        
  2007-09-10  Kenneth Nielsen  <k nielsen81 gmail com>
  
  	* da.po: Updated Danish translation
@@@ -2238,8 -2621,8 +1263,8 @@@
  	* sv.po: Updated Swedish translation.
  
  2007-09-10  Jovan Naumovski  <jovan lugola net>
--
--	* mk.po: Updated Macedonian translation.
++ 
++ 	* mk.po: Updated Macedonian translation.
  
  2007-09-10  Ankit Patel  <ankit644 yahoo com>
  
@@@ -2251,9 -2634,9 +1276,9 @@@
  
  2007-09-08  Inaki Larranaga Murgoitio  <dooteo zundan com>
  
--	* eu.po: Fixed some typos in Basque translation.
++        * eu.po: Fixed some typos in Basque translation.
  
--2007-09-07  Clytie Siddall <clytie riverland net au>
++2007-09-07   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
@@@ -2270,12 -2653,12 +1295,12 @@@
  	* de.po: Updated German translation, fix #474050.
  
  2007-09-05  Jovan Naumovski  <jovan lugola net>
--
--	* mk.po: Updated Macedonian translation.
++ 
++ 	 * mk.po: Updated Macedonian translation.
  
  2007-09-04  Jovan Naumovski  <jovan lugola net>
--
--	* mk.po: Updated Macedonian translation.
++ 
++ 	 * mk.po: Updated Macedonian translation.
  
  2007-09-04  Stéphane Raimbault  <stephane raimbault gmail com>
  
@@@ -2307,7 -2690,7 +1332,7 @@@
  	* th.po: Updated Thai translation.
  	* ChangeLog: Fix newlines in Clytie's recent entry.
  
--2007-09-02  Clytie Siddall <clytie riverland net au>
++2007-09-02   Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
  
@@@ -2329,8 -2712,8 +1354,8 @@@
  
  2007-08-30  Ilkka Tuohela  <hile iki fi>
  
--	* fi.po: Updated Finnish translation
--	(fix for bug #471749)
++	* fi.po: Updated Finnish translation 
++	         (fix for bug #471749)
  
  2007-08-30  Takeshi AIHANA <takeshi aihana gmail com>
  
@@@ -2342,7 -2725,7 +1367,7 @@@
  	by Washington Lins <washington-lins uol com br>.
  
  2007-08-29  Jovan Naumovski  <jovan lugola net>
--
++ 
  	* mk.po: Updated Macedonian translation.
  
  2007-08-29  Ankit Patel  <ankit644 yahoo com>
@@@ -2393,7 -2776,7 +1418,7 @@@
  
  	* sv.po: Updated Swedish translation.
  
--2007-08-24  Jorge Gonzalez <jorgegonz svn gnome org>
++2007-08-24  Jorge Gonzalez <jorgegonz svn gnome org> 
  
  	* es.po: Updated Spanish translation.
  
@@@ -2471,7 -2854,7 +1496,7 @@@
  2007-08-17  Hendrik Richter  <hendrikr gnome org>
  
  	* de.po: Updated German translation, by
--	Andre Klapper <ak-47 gmx net>
++	         Andre Klapper <ak-47 gmx net>
  
  2007-08-17  Ankit Patel  <ankit644 yahoo com>
  
@@@ -2532,20 -2915,20 +1557,20 @@@
  
  2007-08-12  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2007-08-12  Hendrik Richter  <hendrikr gnome org>
  
  	* de.po: Updated German translation, by
--	Andre Klapper <ak-47 gmx net>
++	         Andre Klapper <ak-47 gmx net>
  
  2007-08-12  Johnny Jacob  <jjohnny novell com>
--
--	* POTFILES.in : Added new file for translation.
--
++ 
++       * POTFILES.in : Added new file for translation.
++ 
  2007-08-11  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2007-08-11  Daniel Nylander <po danielnylander se>
  
@@@ -2602,7 -2985,7 +1627,7 @@@
  2007-08-03  Danishka Navin <snavin svn gnome org>
  
  	* si.po:  Sinhala Translation updated by Danishka Navin
--
++	
  
  2007-08-01  Daniel Nylander <po danielnylander se>
  
@@@ -2622,7 -3005,7 +1647,7 @@@
  
  2007-07-30  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++	* es.po: Updated Spanish translation 
  
  2007-07-30  Daniel Nylander <po danielnylander se>
  
@@@ -2638,7 -3021,7 +1663,7 @@@
  
  2007-07-29  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-07-29  Daniel Nylander <po danielnylander se>
  
@@@ -2650,14 -3033,14 +1675,14 @@@
  
  2007-07-27  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-07-24  Johnny Jacob  <jjohnny novell com>
  
  	** Fixes 459251
--
++	
  	* POTFILES.in : Added new files with translatable strings.
--
++	
  2007-07-23  Matic Žgur  <mr zgur gmail com>
  
  	* sl.po: Updated Slovenian translation.
@@@ -2678,7 -3061,7 +1703,7 @@@
  
  2007-07-21  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-07-21  Danilo Å egan  <danilo gnome org>
  
@@@ -2694,11 -3077,11 +1719,11 @@@
  
  2007-06-17  Raivis Dejus  <orvils gmail com>
  
--	* lv.po: Updated Latvian Translation.
++        * lv.po: Updated Latvian Translation.
  
  2007-06-18  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation. Fixes bug #457959.
++        * es.po: Updated Spanish translation. Fixes bug #457959.
  
  2007-07-17  Daniel Nylander <po danielnylander se>
  
@@@ -2706,7 -3089,7 +1731,7 @@@
  
  2007-06-17  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation.
++        * es.po: Updated Spanish translation.
  
  2007-07-16  Ilkka Tuohela  <hile iki fi>
  
@@@ -2730,11 -3113,11 +1755,11 @@@
  
  2007-07-10  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-07-09  Jovan Naumovski  <jovan lugola net>
--
--	* mk.po: Updated Macedonian translation.
++ 
++ 	 * mk.po: Updated Macedonian translation.
  
  2007-07-09  Chenthill Palanisamy  <pchenthill novell com>
  
@@@ -2748,7 -3131,7 +1773,7 @@@
  
  2007-07-07  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-07-02  Nguy�n Thái Ng�c Duy <pclouds gmail com>
  
@@@ -2797,7 -3180,7 +1822,7 @@@
  
  2007-06-19  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-06-19  Daniel Nylander <po danielnylander se>
  
@@@ -2809,7 -3192,7 +1834,7 @@@
  
  2007-06-17  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-06-15  Matthew Barnes  <mbarnes redhat com>
  
@@@ -2817,7 -3200,7 +1842,7 @@@
  
  2007-06-15  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-06-13  Daniel Nylander <po danielnylander se>
  
@@@ -2841,17 -3224,17 +1866,17 @@@
  
  2007-06-05  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-06-03  Srinivasa Ragavan  <sragavan novell com>
  
--	** Fix for version removal from Installed files from Gilles Dartiguelongue
++        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
  
  	* POTFILES.in:
  
--2007-06-02  Jorge Gonzalez <jorgegonz svn gnome org>
++2007-06-02  Jorge Gonzalez <jorgegonz svn gnome org> 
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-06-02  Theppitak Karoonboonyanan  <thep linux thai net>
  
@@@ -2874,7 -3257,7 +1899,7 @@@
  
  2007-05-28  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation 
  
  2007-05-27  Daniel Nylander <po danielnylander se>
  
@@@ -2903,7 -3286,7 +1928,7 @@@
  
  2007-05-22  Jorge Gonzalez <jorgegonz svn gnome org>
  
--	* es.po: Updated Spanish translation
++        * es.po: Updated Spanish translation
  
  2007-05-22  Jakub Friedl  <jfriedl suse cz>
  
@@@ -2932,7 -3315,7 +1957,7 @@@
  
  	* en_GB.po: Updated British English translation
  
--2007-05-15  Jorge Gonzalez <jorgegonz svn gnome org>
++2007-05-15  Jorge Gonzalez <jorgegonz svn gnome org> 
  
  	* es.po: Updated Spanish translation
  
@@@ -3006,7 -3389,7 +2031,7 @@@
  2007-04-22  Yair Hershkovitz <yairh gmail com>
  
  	* he.po: Updated Hebrew translation
--
++	
  2007-04-21  Daniel Nylander <po danielnylander se>
  
  	* sv.po: Updated Swedish translation.
@@@ -3017,7 -3400,7 +2042,7 @@@
  	* sv.po: Updated Swedish translation.
  	* POTFILES.in: Added missing files.
  
--2007-04-14  Djihed Afifi <djihed gmail com>
++2007-04-14  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
@@@ -3068,7 -3451,7 +2093,7 @@@
  2007-03-12  Goran RakiÄ?  <grakic devbase net>
  
  	* sr.po, sr Latn po: Updated Serbian translation, by
--	Igor NestoroviÄ? <jung one ekof bg ac yu>
++	         Igor NestoroviÄ? <jung one ekof bg ac yu>
  
  2007-03-12  Jakub Friedl  <jfriedl suse cz>
  
@@@ -3077,7 -3460,7 +2102,7 @@@
  2007-03-12  Hendrik Richter  <hendrikr gnome org>
  
  	* de.po: Updated German translation, by
--	Christian Kintner <mail christian-kintner de>
++	         Christian Kintner <mail christian-kintner de>
  
  2007-03-12  Theppitak Karoonboonyanan  <thep linux thai net>
  
@@@ -3159,7 -3542,7 +2184,7 @@@
  
  2007-03-03  Jovan Naumovski  <jovan lugola net>
  
--	* mk.po: Updated Macedonian translation.
++	 * mk.po: Updated Macedonian translation.
  
  2007-03-02  David Lodge <dave cirt net>
  
@@@ -3173,7 -3556,7 +2198,7 @@@
  
  	* fr.po: Updated French translation by Jonathan Ernst.
  
--2007-02-28  Djihed Afifi <djihed gmail com>
++2007-02-28  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
@@@ -3298,7 -3681,7 +2323,7 @@@
  
  	* en_GB.po: Updated English (British) translation
  
--2007-02-16  Djihed Afifi <djihed gmail com>
++2007-02-16  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Djihed Afifi.
  
@@@ -3326,7 -3709,7 +2351,7 @@@
  
  	* fi.po: Updated Finnish translation.
  
--2007-02-11  Djihed Afifi <djihed gmail com>
++2007-02-11  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Khaled Hosny.
  
@@@ -3347,7 -3730,7 +2372,7 @@@
  
  	* de.po: Updated German translation.
  
--2007-02-9  Djihed Afifi <djihed gmail com>
++2007-02-9  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Ahmad Farghal.
  
@@@ -3355,7 -3738,7 +2380,7 @@@
  
  	* en_GB.po: Updated English (British) translation
  
--2007-02-8  Djihed Afifi <djihed gmail com>
++2007-02-8  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Ahmad Farghal.
  
@@@ -3448,7 -3831,7 +2473,7 @@@
  
  	* sv.po: Updated Swedish translation.
  	* POTFILES.in: Added missing files.
--
++	
  2007-01-10  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation.
@@@ -3456,7 -3839,7 +2481,7 @@@
  2007-01-09  Daniel Nylander <po danielnylander se>
  
  	* sv.po: Updated Swedish translation.
--
++	
  2007-01-06  Priit Laes  <plaes svn gnome org>
  
  	* et.po: Updated Estonian translation by Ivar Smolin.
@@@ -3465,12 -3848,12 +2490,12 @@@
  
  	* vi.po: Updated Vietnamese translation.
  
--2006-01-03  Jordi Mas <jmas softcatala org>, Bernat Tallaferro
++2006-01-03  Jordi Mas <jmas softcatala org>, Bernat Tallaferro 
  	<bernat tallaferro gmail com>
  
  	* ca.po: Catalan translation fixes
  
--2007-01-3  Djihed Afifi <djihed gmail com>
++2007-01-3  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation by Ahmad Farghal.
  
@@@ -3486,19 -3869,19 +2511,19 @@@
  
  	* en_GB.po: Updated English (British) translation
  
--2006-12-28  Djihed Afifi <djihed gmail com>
++2006-12-28  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
--2006-12-28  Djihed Afifi <djihed gmail com>
++2006-12-28  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
--2006-12-27  Djihed Afifi <djihed gmail com>
++2006-12-27  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
--2006-12-26  Djihed Afifi <djihed gmail com>
++2006-12-26  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
@@@ -3506,11 -3889,11 +2531,11 @@@
  
  	* sr.po, sr Latn po: Fix bug #355974, updated.
  
--2006-12-24  Djihed Afifi <djihed gmail com>
++2006-12-24  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
--2006-12-22  Djihed Afifi <djihed gmail com>
++2006-12-22  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
@@@ -3518,7 -3901,7 +2543,7 @@@
  
  	* nb.po: Updated Norwegian bokmål translation.
  
--2006-12-18  Djihed Afifi <djihed gmail com>
++2006-12-18  Djihed Afifi <djihed gmail com> 
  
  	* ar.po: Updated Arabic Translation.
  
@@@ -3681,7 -4064,7 +2706,7 @@@
  	* et.po: Translation updated by Ivar Smolin.
  
  2006-10-15  Jovan Naumovski  <jovan lugola net>
--
++	
  	* mk.po: Updated Macedonian translation.
  
  2006-10-15  Ilkka Tuohela  <hile iki fi>
@@@ -3707,7 -4090,7 +2732,7 @@@
  2006-10-14  Priit Laes  <plaes cvs gnome org>
  
  	* et.po: Translation updated by Ivar Smolin.
--
++ 
  2006-10-13  Alexander Shopov  <ash contact bg>
  
  	* bg.po: Updated Bulgarian translation by
@@@ -4192,7 -4575,7 +3217,7 @@@
  2006-08-20  Hendrik Richter  <hendrikr gnome org>
  
  	* de.po: Updated German translation, by
--	Christian Kintner <mail christian-kintner de>
++	 Christian Kintner <mail christian-kintner de>
  
  2006-08-20  Wouter Bolsterlee  <uws+gnome xs4all nl>
  
@@@ -4205,7 -4588,7 +3230,7 @@@
  2006-08-20  Hendrik Richter  <hendrikr gnome org>
  
  	* de.po: Updated German translation, by
--	Christian Kintner <mail christian-kintner de>
++	 Christian Kintner <mail christian-kintner de>
  
  2006-08-19  Priit Laes  <plaes cvs gnome org>
  
@@@ -4232,7 -4615,7 +3257,7 @@@
  	* mk.po: Updated Macedonian translation.
  
  2006-08-18  Subhransu Behera  <arya_subhransu yahoo co in>
--
++	
  	* or.po: Updated Oriya Translation.
  
  2006-08-18  Subhransu Behera  <arya_subhransu yahoo co in>
@@@ -4267,7 -4650,7 +3292,7 @@@
  2006-08-16  Daniel Nylander <po danielnylander se>
  
  	* sv.po: Updated Swedish translation.
--
++	
  2006-08-16  Gabor Kelemen  <kelemeng gnome hu>
  
  	* hu.po: Translation updated.
@@@ -4283,7 -4666,7 +3308,7 @@@
  2006-08-13  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi Translations
--
++	
  2006-08-12  Clytie Siddall <clytie riverland net au>
  
  	* vi.po: Updated Vietnamese translation.
@@@ -4304,7 -4687,7 +3329,7 @@@
  2006-08-11  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi translation
--
++	
  2006-08-11  Vincent van Adrighem  <adrighem gnome org>
  
  	* nl.po: Translation updated by Tino Meinen.
@@@ -4350,7 -4733,7 +3375,7 @@@
  2006-08-09  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi translation.
--
++	
  2006-08-09  Funda Wang  <fundawang linux net cn>
  
  	* zh_CN.po: Updated Simplified Chinese translation.
@@@ -4362,15 -4745,15 +3387,15 @@@
  2006-08-09  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi translation
--
++	
  2006-08-09  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi translation
--
++	
  2006-08-09  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation.
--	Includes fix for translation bug 350386
++			 Includes fix for translation bug 350386
  
  2006-08-08  Kjartan Maraas  <kmaraas gnome org>
  
@@@ -4379,7 -4762,7 +3404,7 @@@
  2006-08-08  Rahul Bhalerao  <b rahul pm gmail com>
  
  	* mr.po: Updated Marathi translation.
--
++	
  2006-08-08  Ankit Patel  <ankit644 yahoo com>
  
  	* gu.po: Updated Gujarati Translation.
@@@ -4396,13 -4779,13 +3421,13 @@@
  
  	* mr.po: Added a new file for Marathi
  	* LINGUAS: Added a corrosponding entry for Marathi(mr) in LINGUAS file
--
++	
  2006-08-07  Francisco Javier F. Serrador  <serrador openshine com>
  
  	* es.po: Updated Spanish translation.
  
  2006-08-07  Jovan Naumovski  <jovan lugola net>
--
++	
  	* mk.po: Updated Macedonian translation.
  
  2006-08-07  Inaki Larranaga  <dooteo euskalgnu org>
@@@ -4419,7 -4802,7 +3444,7 @@@
  
  2006-08-06  Funda Wang  <fundawang linux net cn>
  
--	* zh_CN.po: Updated Simplified Chinese translation.
++	* zh_CN.po: Updated Simplified Chinese translation. 
  
  2006-08-05  Jovan Naumovski  <jovan lugola net>
  
@@@ -4440,7 -4823,7 +3465,7 @@@
  2006-08-04  Daniel Nylander <po danielnylander se>
  
  	* sv.po: Updated Swedish translation.
--
++	
  2006-08-04  Jordi Mas <jmas softcatala org>
  
  	* ca.po: Catalan translation update
@@@ -4635,7 -5018,7 +3660,7 @@@
  2006-07-16  Daniel Nylander  <po danielnylander se>
  
  	* sv.po: Updated Swedish translation.
--
++	
  2006-07-14  Priit Laes  <amd store20 com>
  
  	* et.po: Translation updated by Ivar Smolin.
@@@ -4658,8 -5041,8 +3683,8 @@@
  
  2006-07-11  Ilkka Tuohela  <hile iki fi>
  
--	* fi.po: Revert some localized time fields to %H:%M
--	(it's not possible to enter %H.%M, see bug #347241)
++	* fi.po: Revert some localized time fields to %H:%M 
++	  (it's not possible to enter %H.%M, see bug #347241)
  
  2006-07-11  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
  
@@@ -4706,7 -5089,7 +3731,7 @@@
  2006-07-07  Ahmad Riza H Nst  <rizahnst eriagempita co id>
  
  	* id.po: Updated.
--
++	
  2006-07-06  Inaki Larranaga  <dooteo euskalgnu org>
  
  	* eu.po: Updated Basque translation.
@@@ -4994,7 -5377,7 +4019,7 @@@
  
  2006-04-30  Lukas Novotny  <lukasnov cvs gnome org>
  
--	* cs.po: Updated Czech translation.
++ 	* cs.po: Updated Czech translation.
  
  2006-04-30  Kjartan Maraas <kmaraas gnome org>
  
@@@ -5018,7 -5401,7 +4043,7 @@@
  
  2006-04-23  Lukas Novotny  <lukasnov cvs gnome org>
  
--	* cs.po: Updated Czech translation.
++ 	* cs.po: Updated Czech translation.
  
  2006-04-23  Ignacio Casal Quinteiro  <nacho resa gmail com>
  
@@@ -5078,11 -5461,11 +4103,11 @@@
  2006-04-10  Roozbeh Pournader  <roozbeh farsiweb info>
  
  	* fa.po: Remove "%OC" from translations, as it only works with
--	Sharif Linux's modified glibc (patch by Elnaz Sarbar).
++	  Sharif Linux's modified glibc (patch by Elnaz Sarbar).
  
  2006-04-09  Lukas Novotny  <lukasnov cvs gnome org>
  
--	* cs.po: Updated Czech translation.
++ 	* cs.po: Updated Czech translation.
  
  2006-04-08  Theppitak Karoonboonyanan  <thep linux thai net>
  
@@@ -5099,7 -5482,7 +4124,7 @@@
  2006-04-04  Roozbeh Pournader  <roozbeh farsiweb info>
  
  	* fa.po: Updated Persian translation by Elnaz Sarbar and Meelad
--	Zakaria.
++	  Zakaria.
  
  2006-03-30  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -5181,8 -5564,8 +4206,8 @@@
  
  2006-03-10  Vladimer Sichinava  <vlsichinava gmail com>
  
--	* ka.po: Updated Georgian translation by
--	Alexander Didebulidze <didebuli in tum de>.
++	* ka.po: Updated Georgian translation by 
++	  Alexander Didebulidze <didebuli in tum de>.
  
  2006-03-10  Mugurel Tudor  <mugurelu gnome ro>
  
@@@ -5239,7 -5622,7 +4264,7 @@@
  
  2006-03-03  Lukas Novotny  <lukasnov cvs gnome org>
  
--	* cs.po: Updated Czech translation.
++ 	* cs.po: Updated Czech translation.
  
  2006-03-03  Žygimantas BeruÄ?ka  <zygis gnome org>
  
@@@ -5575,7 -5958,7 +4600,7 @@@
  
  2006-02-04  Lukas Novotny  <lukasnov cvs gnome org>
  
--	* cs.po: Updated Czech translation.
++ 	* cs.po: Updated Czech translation.
  
  2006-02-02  Laurent Dhima  <laurenti alblinux net>
  
@@@ -5608,7 -5991,7 +4633,7 @@@
  2006-01-31  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation.
--
++	
  2006-01-31  Priit Laes  <plaes cvs gnome org>
  
  	* et.po: Translation updated by Ivar Smolin.
@@@ -5724,7 -6107,7 +4749,7 @@@
  
  2006-01-25  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-25  Clytie Siddall <clytie riverland net au>
  
@@@ -5748,7 -6131,7 +4773,7 @@@
  
  2006-01-24  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-23  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -5805,7 -6188,7 +4830,7 @@@
  
  	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
  	* zh_HK.po: Added Traditional Chinese translation(Hong Kong).
--
++	
  2006-01-20  Ignacio Casal Quinteiro  <nacho resa gmail com>
  
  	* gl.po: Updated Galician Translation.
@@@ -5846,10 -6229,10 +4871,10 @@@
  2006-01-18  Slobodan D. Sredojevic  <slobo akrep be>
  
  	* sr.po, sr Latn po: Updated Serbian translation
--
++	
  2006-01-17  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-17  Clytie Siddall <clytie riverland net au>
  
@@@ -5914,7 -6297,7 +4939,7 @@@
  
  2006-01-11  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-11  Clytie Siddall <clytie riverland net au>
  
@@@ -5940,7 -6323,7 +4965,7 @@@
  
  2005-01-09  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-09  Takeshi AIHANA <aihana gnome gr jp>
  
@@@ -5966,7 -6349,7 +4991,7 @@@
  2005-01-06  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation.
--
++	
  2005-01-06  Ankit Patel  <ankit644 yahoo com>
  
  	* gu.po: Updated Gujarati Translation.
@@@ -5999,7 -6382,7 +5024,7 @@@
  
  2005-01-04  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-03  Takeshi AIHANA <aihana gnome gr jp>
  
@@@ -6007,7 -6390,7 +5032,7 @@@
  
  2005-01-03  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-02  Adam Weinberger  <adamw gnome org>
  
@@@ -6023,7 -6406,7 +5048,7 @@@
  
  2006-01-01  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2006-01-02  Kjartan Maraas  <kmaraas gnome org>
  
@@@ -6085,7 -6468,7 +5110,7 @@@
  
  2005-12-26  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2005-12-25  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -6122,19 -6505,19 +5147,19 @@@
  
  2005-12-21  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2005-12-21  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
  	* es.po: Updated Spanish translation.
  
  2005-12-20  Žygimantas BeruÄ?ka  <zygis gnome org>
--
++	
  	* lt.po: Updated Lithuanian translation.
  
  2005-12-20  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2005-12-10  Ales Nyakhaychyk  <nab mail by>
  
@@@ -6158,7 -6541,7 +5183,7 @@@
  
  2005-12-16  Ankit Patel  <ankit644 yahoo com>
  
--	* gu.po: Updated Gujarati Translation.
++        * gu.po: Updated Gujarati Translation.
  
  2005-12-15  Ignacio Casal Quinteiro  <nacho resa gmail com>
  
@@@ -6430,7 -6813,7 +5455,7 @@@
  2005-09-13  Roozbeh Pournader  <roozbeh farsiweb info>
  
  	* fa.po: Updated Persian translation by Elnaz Sarbar
--	<elnaz farsiweb info> and Meelad Zakaria <meelad farsiweb info>.
++	  <elnaz farsiweb info> and Meelad Zakaria <meelad farsiweb info>.
  
  2005-09-12  Mugurel Tudor  <mugurelu gnome ro>
  
@@@ -6543,7 -6926,7 +5568,7 @@@
  
  2005-08-27  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-08-26  Mohammad DAMT  <mdamt gnome org>
  
@@@ -6606,12 -6989,12 +5631,12 @@@
  	* uk.po: Updated Ukrainian translation.
  
  2005-08-22  Nickolay V. Shmyrev  <nshmyrev yandex ru>
--
++    
  	* ru.po: Updated Russian translation.
  
  2005-08-22  Mohammad DAMT  <mdamt gnome org>
  
--	* id.po: Updated Indonesian translation
++	* id.po: Updated Indonesian translation 
  
  2005-08-22  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -6635,7 -7018,7 +5660,7 @@@
  
  2005-08-22  Danilo Å egan  <danilo gnome org>
  
--	* POTFILES.in: Removed shell/e-shell-offline-handler.c,
++	* POTFILES.in: Removed 	shell/e-shell-offline-handler.c,
  	calendar/gui/calendar-offline-handler.c.
  
  2005-08-22  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
@@@ -6645,7 -7028,7 +5670,7 @@@
  2005-08-22  Mohammad DAMT  <mdamt gnome org>
  
  	* POTFILES.in: reverted (accidentally updated by my previous check in)
--
++	
  2005-08-22  Mohammad DAMT  <mdamt gnome org>
  
  	* id.po: Updated Indonesian translation.
@@@ -6706,7 -7089,7 +5731,7 @@@
  
  2005-08-17  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-08-16  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -6866,7 -7249,7 +5891,7 @@@
  
  2005-08-09  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-08-09  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
  
@@@ -6914,7 -7297,7 +5939,7 @@@
  	* pt_BR.po: Updated Brazilian Portuguese translation.
  
  2005-08-07  Ilkka Tuohela  <hile iki fi>
--
++	
  	* fi.po: Updated Finnish translation.
  
  2005-08-06  Rhys Jones  <rhys sucs org>
@@@ -6931,7 -7314,7 +5956,7 @@@
  
  2005-08-06  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-08-06  Ankit Patel <ankit644 yahoo com>
  
@@@ -6977,7 -7360,7 +6002,7 @@@
  2005-08-04  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Updated Finnish translation.
--
++	
  2005-08-04  Vincent van Adrighem  <adrighem gnome org>
  
  	* nl.po: Translation updated by Tino Meinen.
@@@ -6997,7 -7380,7 +6022,7 @@@
  
  2005-08-04  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-08-04  Sunil Mohan Adapa <sunil atc tcs co in>
  
@@@ -7034,7 -7417,7 +6059,7 @@@
  2005-07-31  Ilkka Tuohela  <hile iki fi>
  
  	* fi.po: Bulk updates to Finnish translation
--	for new gnome.fi website.
++             for new gnome.fi website.
  
  2005-07-29  Takeshi AIHANA <aihana gnome gr jp>
  
@@@ -7054,7 -7437,7 +6079,7 @@@
  
  2005-07-28  Ilkka Tuohela  <hile iki fi>
  
--	* fi.po: Bulk change to some Finnish translations.
++	* fi.po: Bulk change to some Finnish translations.       
  
  2005-07-28  Ankit Patel <ankit644 yahoo com>
  
@@@ -7103,7 -7486,7 +6128,7 @@@
  
  2005-07-25  Ilkka Tuohela  <hile iki fi>
  
--	* fi.po: Updated Finnish translation
++	* fi.po: Updated Finnish translation 
  
  2005-07-24  Ilkka Tuohela  <hile iki fi>
  
@@@ -7120,7 -7503,7 +6145,7 @@@
  
  2005-07-24  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-23  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -7145,7 -7528,7 +6170,7 @@@
  
  2005-07-23  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-23  Priit Laes  <plaes cvs gnome org>
  
@@@ -7163,7 -7546,7 +6188,7 @@@
  
  2005-07-22  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-22  Alexander Shopov  <ash contact bg>
  
@@@ -7196,7 -7579,7 +6221,7 @@@
  
  2005-07-20  Sankar P <psankar novell com>
  
--	* POTFILES.in : Changed the path of the files that
++	* POTFILES.in : Changed the path of the files that 
  	are moved due to the consolidation of proxy features' plugins
  	into the groupwise-features plugin.
  
@@@ -7217,7 -7600,7 +6242,7 @@@
  	* et.po: Translation updated by Ivar Smolin.
  
  2005-07-19  Vivek Jain <jvivek novell com>
--
++	
  	* POTFILES.in : added plugins/groupwise-features/junk-mail
  	files
  
@@@ -7247,7 -7630,7 +6272,7 @@@
  
  2005-07-17  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-17  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -7259,7 -7642,7 +6284,7 @@@
  
  2005-07-16  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-16  Sarfraaz Ahmed <asarfraaz novell com>
  
@@@ -7269,7 -7652,7 +6294,7 @@@
  
  	*plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
  	: Add file for translation.
--
++	
  2005-07-14  Priit Laes  <plaes cvs gnome org>
  
  	* et.po: Translation updated by Ivar Smolin.
@@@ -7284,14 -7667,14 +6309,14 @@@
  
  2005-07-13  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-13  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
  	* es.po: Updated Spanish translation.
  
  2005-07-12  Vivek Jain <jvivek novell com>
--
++	
  	(put the changelog entry here
  	2005-07-10  Shreyas Srinivasan <sshreyas novell com>)
  
@@@ -7312,16 -7695,16 +6337,16 @@@
  	NestoroviÄ?.
  
  2005-07-11  Vivek Jain <jvivek novell com>
--
++	
  	* POTFILES.in : relocated camel-gw-listener.c
  
  2005-07-11  Sankar P <psankar novell com>
  
  	* POTFILES.in : Added the proxy.c file to the list.
--
++	
  2005-07-10  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-09  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -7329,8 -7712,8 +6354,8 @@@
  
  2005-07-09  Chao-Hsiung Liao  <j_h_liau yahoo com tw>
  
--	* zh_TW.po: Updated Traditional Chinese translation.
--
++        * zh_TW.po: Updated Traditional Chinese translation.
++	
  2005-07-08  Adam Weinberger  <adamw gnome org>
  
  	* en_CA.po: Updated Canadian English translation.
@@@ -7349,13 -7732,13 +6374,13 @@@
  
  2005-07-07  Clytie Siddall <clytie riverland net au>
  
--	* vi.po: Updated Vietnamese translation.
++        * vi.po: Updated Vietnamese translation.
  
  2005-07-07 Vivek Jain <jvivek novell com>
--
--	* POTFILES.in : updated with the changed location of
++	
++	* POTFILES.in : updated with the changed location of 
  	em-junk-filter.c
--
++	
  2005-07-07  Alexander Shopov  <ash contact bg>
  
  	* bg.po: Updated Bulgarian translation by
@@@ -7410,7 -7793,7 +6435,7 @@@
  2005-06-28  Kaushal Kumar  <kakumar novell com>
  
  	* POTFILES.in: Added the remaining relevant gal files.
--
++	
  	* POTFILES.skip: Added the gal files which need to be skipped.
  
  2005-07-06  Not Zed  <NotZed Ximian com>
@@@ -7595,7 -7978,7 +6620,7 @@@
  	Ivelina Karcheva <anima mail bg>
  
  2005-05-23  Vivek Jain  <jvivek novell com>
--
++	
  	* POTFILES.in: replaced shared-folder/
  	send-options/ groupwise-send-options/
  	groupwise-account-setup/ with groupwise-features/
@@@ -7649,12 -8032,12 +6674,12 @@@
  2005-05-03  Roozbeh Pournader  <roozbeh farsiweb info>
  
  	* fa.po: Updated Persian translation by Meelad Zakaria
--	<meelad farsiweb info> and myself.
++	  <meelad farsiweb info> and myself.
  
  2005-05-02  Roozbeh Pournader  <roozbeh farsiweb info>
  
  	* fa.po: Updated Persian translation by Meelad Zakaria
--	<meelad farsiweb info> and myself.
++	  <meelad farsiweb info> and myself.
  
  2005-04-30  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -7887,7 -8270,7 +6912,7 @@@
  
  	* POTFILES.in: e-passwords moved to e-d-s
  
--2005-02-23  Jordi Mallach  <jordi sindominio net>
++2005-02-23  Jordi Mallach   <jordi sindominio net>
  
  	* ca.po: Updated Catalan translation by
  	Josep Puigdemont <josep imatge-sintetica com>.
@@@ -8001,7 -8384,7 +7026,7 @@@
  
  2005-02-18  Marco Ciampa <ciampix libero it>
  
--	* it.po: Updated italian translation by Luca
++	* it.po: Updated italian translation by Luca 
  	Ferretti <elle uca infinito it>
  
  2005-02-16  Martin Willemoes Hansen  <mwh sysrq dk>
@@@ -8208,7 -8591,7 +7233,7 @@@
  2005-01-28  JP Rosevear  <jpr novell com>
  
  	Fixes #71930
--
++	
  	* POTFILES.in: add missing e-error files
  
  2005-01-28  Christian Rose  <menthos menthos com>
@@@ -8342,7 -8725,7 +7367,7 @@@
  2005-01-14 Marco Ciampa <ciampix libero it>
  
  	* it.po: updated italian translation
--
++	
  2005-01-13 Marco Ciampa <ciampix libero it>
  
  	* it.po: updated italian translation
@@@ -8420,7 -8803,7 +7445,7 @@@
  
  2004-12-30  Alexander Shopov  <ash contact bg>
  
--	* bg.po: Updated Bulgarian translation by
++	 * bg.po: Updated Bulgarian translation by
  	myself
  
  2004-12-29  Alexander Shopov  <ash contact bg>
@@@ -8435,7 -8818,7 +7460,7 @@@
  2004-12-18  JP Rosevear  <jpr novell com>
  
  	Fixes #68841
--
++	
  	* pt_BR.po: fix markup in translated message
  
  2004-12-18  Christian Rose  <menthos menthos com>
@@@ -8485,10 -8868,10 +7510,10 @@@
  
  2004-12-03  Martin Willemoes Hansen  <mwh sysrq dk>
  
--	* POTFILES.in:
--	Removed mail/mail-account-editor.c
--	Removed mail/mail-config-druid.c
--	They are no longer available.
++	* POTFILES.in: 
++	  Removed mail/mail-account-editor.c
++	  Removed mail/mail-config-druid.c
++	  They are no longer available.
  	* da.po: Updated Danish translation.
  
  2004-12-01  Dafydd Harries  <daf muse 19inch net>
@@@ -8562,7 -8945,7 +7587,7 @@@
  2004-11-04  Miloslav Trmac  <mitr volny cz>
  
  	* cs.po: Fixed Czech translation (thanks to
--	Juraj Kubelka <Juraj Kubelka email cz>).
++	 Juraj Kubelka <Juraj Kubelka email cz>).
  
  2004-10-26  Martin Willemoes Hansen  <mwh sysrq dk>
  
@@@ -8683,7 -9066,7 +7708,7 @@@
  
  2004-09-29  Marco Ciampa  <ciampix libero it>
  
--	* it.po: italian translation, locale and hotkey trim
++        * it.po: italian translation, locale and hotkey trim
  
  2004-09-28  Vincent van Adrighem  <adrighem gnome org>
  
@@@ -8708,11 -9091,11 +7733,11 @@@
  
  2004-09-24  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-09-23  Marco Ciampa  <ciampix libero it>
  
--	* it.po: updated italian translation.
++        * it.po: updated italian translation.
  
  2004-09-23  Adam Weinberger  <adamw gnome org>
  
@@@ -8720,12 -9103,12 +7745,13 @@@
  
  2004-09-22  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation from
++        * fr.po: Updated French translation from
  	Craig Jeffares <cjeffares novell com>.
  
  2004-09-22  Craig Jeffares  <cjeffares novell com>
  
--	* it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
++        * it.po & zh_TW.po: Updated Italian & Chinese Trad translation.
++
  
  2004-09-21  Adam Weinberger  <adamw gnome org>
  
@@@ -8762,7 -9145,7 +7788,7 @@@
  
  2004-09-12  Hasbullah Bin Pit <sebol my-penguin org>
  
--	* ms.po: Updated Malay Translation.
++        * ms.po: Updated Malay Translation.
  
  2004-09-11  Mugurel Tudor  <mugurelu go ro>
  
@@@ -8813,18 -9196,18 +7839,18 @@@
  	* nl.po: Translation updated by Daniel van Eeden.
  
  2004-09-05  �smund Skjæveland <aasmunds fys uio no>
--
++	
  	* nn.po: Updated Norwegian Nynorsk translation:
--	Merged translations from gnome-2-8 branch.
++       	         Merged translations from gnome-2-8 branch.
  
  2004-09-04  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-09-03  JP Rosevear  <jpr novell com>
  
  	Fixes #65030
--
++	
  	* en_GB.po: Correct typo
  
  2004-09-03  Baris Cicek <baris teamforce name tr>
@@@ -8847,14 -9230,14 +7873,14 @@@
  
  	* hi.po: Updated Hindi translation by
  	Rajesh Ranjan <rranjan redhat com>
--
++		
  2004-08-30  �smund Skjæveland <aasmunds fys uio no>
  
--	* nn.po: Updated Norwegian Nynorsk translation:
--	Merged translations from gnome-2-8 branch.
++	* nn.po: Updated Norwegian Nynorsk translation: 
++       	         Merged translations from gnome-2-8 branch.
  
  2004-08-28  Ales Nyakhaychyk  <nab mail by>
--
++	
  	* be.po: Updated Belarusian translation.
  
  2004-08-29  Funda Wang  <fundawang linux net cn>
@@@ -8888,12 -9271,12 +7914,12 @@@
  
  2004-08-26  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation from Sebastien
--	Bacher <seb128 debian org>.
++        * fr.po: Updated French translation from
++	Sebastien Bacher <seb128 debian org>.
  
  2004-08-25  Hasbullah Bin Pit <sebol imy-penguin org>
--
--	* ms.po: Updated Malay Translation.
++                                                                                
++        * ms.po: Updated Malay Translation.
  
  2004-08-25  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -9062,7 -9445,7 +8088,7 @@@
  
  2004-08-12  Leonid Kanter <leon asplinux ru>
  
--	* ru.po: Updated Russian translation
++        * ru.po: Updated Russian translation
  
  2004-08-12  �smund Skjæveland <aasmunds fys uio no>
  
@@@ -9074,7 -9457,7 +8100,7 @@@
  
  2004-08-11  Leonid Kanter <leon asplinux ru>
  
--	* ru.po: Updated Russian translation from Dan Korostelev <dan ats energo ru>
++        * ru.po: Updated Russian translation from Dan Korostelev <dan ats energo ru>
  
  2004-08-11  Changwoo Ryu  <cwryu debian org>
  
@@@ -9108,7 -9491,7 +8134,7 @@@
  
  	* gu.po: Updated Gujarati translation.
  
--2004-08-09  Amanpreet Singh Alam  <aalam redhat com>
++2004-08-09  Amanpreet Singh Alam   <aalam redhat com>
  
  	* pa.po: Updated Panjabi translation.
  
@@@ -9199,7 -9582,7 +8225,7 @@@
  
  2004-07-29  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation from
++        * fr.po: Updated French translation from
  	Sebastien Bacher <seb128 debian org>.
  
  2004-07-29  Francisco Javier F. Serrador  <serrador cvs gnome org>
@@@ -9244,7 -9627,7 +8270,7 @@@
  
  2004-07-23  �smund Skjæveland  <aasmunds fys uio no>
  
--	* nn.po: Updated Norwegian Nynorsk translation.
++	* nn.po: Updated Norwegian Nynorsk translation.	
  
  2004-07-23  Changwoo Ryu  <cwryu debian org>
  
@@@ -9253,7 -9636,7 +8279,7 @@@
  2004-07-22  Marco Ciampa  <ciampix libero it>
  
  	* it.po: Italian translation updated.
--
++	
  2004-07-21  Takeshi AIHANA <aihana gnome gr jp>
  
  	* ja.po: Updated Japanese translation.
@@@ -9283,7 -9666,7 +8309,7 @@@
  
  	* bg.po: Updated Bulgarian translation by
  	Vladimir "Kaladan" Petkov <vpetkov i-space org>
--
++		
  2004-07-14  Miloslav Trmac  <mitr volny cz>
  
  	* cs.po: Updated Czech translation.
@@@ -9302,7 -9685,7 +8328,7 @@@
  
  2004-07-13  Leonid Kanter <leon asplinux ru>
  
--	* ru.po: updated Russian translation
++        * ru.po: updated Russian translation
  
  2004-07-13  Funda Wang  <fundawang linux net cn>
  
@@@ -9513,7 -9896,7 +8539,7 @@@
  
  2004-06-08  Marco Ciampa  <ciampix libero it>
  
--	* it.po: Italian translation updated.
++        * it.po: Italian translation updated.
  
  2004-06-08  Artur Flinta  <aflinta cvs gnome org>
  
@@@ -9572,7 -9955,7 +8598,7 @@@
  2004-05-25  Marco Ciampa  <ciampix libero it>
  
  	* it.po: Italian translation updated.
--
++	
  2004-05-25  Artur Flinta  <aflinta cvs gnome org>
  
  	* pl.po: Updated Polish translation by GNOME PL Team.
@@@ -9593,7 -9976,7 +8619,7 @@@
  2004-05-23  Marco Ciampa  <ciampix libero it>
  
  	* it.po: Italian translation updated.
--
++	
  2004-05-23  Funda Wang  <fundawang linux net cn>
  
  	* zh_CN.po: Updated Simplified Chinese translation.
@@@ -9769,7 -10152,7 +8795,7 @@@
  2004-04-30  Marco Ciampa <ciampix libero it>
  
  	* it.po: Italian translation updated.
--
++	
  2004-04-30  Priit Laes  <plaes cvs gnome org>
  
  	* et.po: Translation updated.
@@@ -9832,7 -10215,7 +8858,7 @@@
  
  2004-04-24  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-04-24  Takeshi AIHANA <aihana gnome gr jp>
  
@@@ -9941,18 -10324,18 +8967,18 @@@
  	* cs.po: Updated Czech translation.
  
  2004-07-11  Evandro Fernandes Giovanini <evandrofg ig com br>
--
--	* pt_BR.po: Updated Brazilian Portuguese translation
--	from Afonso Celso Medina <medina maua br>.
++ 
++        * pt_BR.po: Updated Brazilian Portuguese translation
++        from Afonso Celso Medina <medina maua br>.
  
  2004-04-10  Adam Weinberger  <adamw gnome org>
  
  	* en_CA.po: Updated Canadian English translation.
  
  2004-07-10  Evandro Fernandes Giovanini <evandrofg ig com br>
--
--	* pt_BR.po: Updated Brazilian Portuguese translation
--	from Afonso Celso Medina <medina maua br>.
++ 
++        * pt_BR.po: Updated Brazilian Portuguese translation
++        from Afonso Celso Medina <medina maua br>.
  
  2004-04-10  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
@@@ -10034,7 -10417,7 +9060,7 @@@
  
  2004-03-27  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-03-27  Priit Laes  <plaes cvs gnome org>
  
@@@ -10302,7 -10685,7 +9328,7 @@@
  
  2004-02-19  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-02-19  Changwoo Ryu  <cwryu debian org>
  
@@@ -10334,7 -10717,7 +9360,7 @@@
  
  2004-02-13  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-02-12  Jordi Mallach  <jordi sindominio net>
  
@@@ -10481,7 -10864,7 +9507,7 @@@
  2004-01-28 Marco Ciampa <ciampix libero it>
  
  	* it.po: updated italian translation.
--
++	
  2004-01-28  Miloslav Trmac  <mitr volny cz>
  
  	* cs.po: Fixed Czech translation.
@@@ -10489,7 -10872,7 +9515,7 @@@
  2004-01-27  Marco Ciampa <ciampix libero it>
  
  	* it.po: updated italian translation.
--
++	
  2004-01-27  �smund Skjæveland  <aasmunds fys uio no>
  
  	* nn.po: Updated Norwegian Nynorsk translation.
@@@ -10513,14 -10896,14 +9539,14 @@@
  2004-01-26  Marco Ciampa  <ciampix libero it>
  
  	* it.po: Updated italian translation.
--
++	
  2004-01-26  Francisco Javier F. Serrador  <serrador cvs gnome org>
  
  	* es.po: Updated Spanish translation.
  
  2004-01-25  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation from
++        * fr.po: Updated French translation from
  	Sebastien Bacher <seb128 debian org>.
  
  2004-01-25  Vincent van Adrighem  <adrighem gnome org>
@@@ -10553,7 -10936,7 +9579,7 @@@
  
  2004-01-25  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation from
++        * fr.po: Updated French translation from
  	Yannick Marchegay <yannick marchegay lokanova com>.
  
  2004-01-25  Funda Wang  <fundawang linux net cn>
@@@ -10628,7 -11011,7 +9654,7 @@@
  
  2004-01-19  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation.
++        * fr.po: Updated French translation.
  
  2004-01-18 Alastair McKinstry <mckinstry computer org>
  
@@@ -10744,7 -11127,7 +9770,7 @@@
  2004-01-07  Marco Ciampa <ciampix libero it>
  
  	* it.po: Updated italian translation.
--
++	
  2004-01-06  Kostas Papadimas <pkst gnome org>
  
  	* el.po: Updated Greek translation.
@@@ -10818,7 -11201,7 +9844,7 @@@
  2003-12-14  Marco Ciampa  <ciampix libero it>
  
  	* it.po: Updated italian translation.
--
++		
  2003-12-13  Kjartan Maraas  <kmaraas gnome org>
  
  	* no.po: Updated Norwegian translation.
@@@ -10833,7 -11216,7 +9859,7 @@@
  
  2003-12-07 Paul Duffy <dubhthach compsoc nuigalway ie>
  
--	* ga.po: Updated Irish Translation, submitted by David O'Callaghan <david ocallaghan cs tcd ie>
++        * ga.po: Updated Irish Translation, submitted by David O'Callaghan <david ocallaghan cs tcd ie>      
  
  2003-12-02  Rodney Dawes  <dobey ixmian com>
  
@@@ -10859,13 -11242,13 +9885,13 @@@
  
  2003-11-19  Rodney Dawes  <dobey ximian com>
  
--	* it.po: Fixed msgstr missing ending
++	* it.po: Fixed msgstr missing ending 
  
  
  2003-11-19  Marco Ciampa <ciampix libero it>
  
  	*  it.po: Updated italian translation
--
++	
  2003-11-18  Hasbullah Bin Pit <sebol ikhlas com>
  
  	* ms.po: Updated initial Malay Translation by
@@@ -10908,7 -11291,7 +9934,7 @@@
  	* POTFILES.in: Add some missing files, and remove files
  	that have been removed from CVS
  	* POTFILES.skip: Add data/evolution.desktop.in
--
++	
  2003-10-23  Chris Toshok  <toshok ximian com>
  
  	* POTFILES.in: add smime files.
@@@ -10936,7 -11319,7 +9962,7 @@@
  2003-10-02  �smund Skjæveland  <aasmunds fys uio no>
  
  	* nn.po: Updated Norwegian (nynorsk) translation.
--
++	
  2003-10-01  �smund Skjæveland  <aasmunds fys uio no>
  
  	* nn.po: Updated Norwegian (nynorsk) translation.
@@@ -10971,7 -11354,7 +9997,7 @@@
  	a long way to go (25% left), but every little bit helps.
  
  2003-09-15 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation (replay date corrected...)
  
  2003-09-11  Hans Petter Jansson  <hpj ximian com>
@@@ -10980,7 -11363,7 +10006,7 @@@
  	programs that don't need i18n, sort.
  
  2003-09-10 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation.
  
  2003-09-07  Wang Jian  <lark linux net cn>
@@@ -10988,10 -11371,10 +10014,10 @@@
  	* zh_CN.po: Merged from evolution-1-4-branch.
  
  2003-08-20 Suresh Chandrasekharan <suresh chandrasekharan sun com>
--
++	
  	* zh_CN.po: Removed illegal '-'s from strptime msgstr, this fixes
--	#43558, Appointment Editor always gives time validation error for
--	apptmnts in non UTF-8/non ASCII locales.
++        #43558, Appointment Editor always gives time validation error for
++        apptmnts in non UTF-8/non ASCII locales.
  
  2003-08-20  Hasbullah Bin Pit <sebol ikhlas com>
  
@@@ -11009,41 -11392,41 +10035,41 @@@
  ")
  
  2003-08-05 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation (revision completed).
  
  2003-08-04 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation (under revision 91% completed).
  
  2003-08-03 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation (under revision 35% completed).
  
  2003-08-02  Christophe Merlet  <redfox redfoxcenter org>
  
--	* fr.po: Updated French translation by
++        * fr.po: Updated French translation by
  	Brigitte Le Grand <brigitte le grand sun com>
  
  2003-08-02 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation (under revision 25% completed).
  
  2003-08-01  Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-07-26  Danilo � egan  <dsegan gmx net>
  
--	* sr.po,sr Latn po: Updated Serbian translation by Serbian team
++	* sr.po,sr Latn po: Updated Serbian translation by Serbian team 
  	(Prevod.org).
  
  	* POTFILES.in: Removed "widgets/misc/e-messagebox.c" because it
  	was removed from repository on July 23, by danw.
  
  2003-07-26 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation.
  
  2003-07-22  Christian Neumair  <chris gnome-de org>
@@@ -11053,30 -11436,30 +10079,30 @@@
  2003-07-21  Hasbullah Bin Pit <sebol ikhlas com>
  
  	* ms.po: Added initial Malay Translation by
--	MIMOS Open Source Development Group <syed mimos my>
++		MIMOS Open Source Development Group <syed mimos my>
  
  2003-07-19  Abel Cheung  <maddog linux org hk>
  
  	* bg.po, ga.po, gl.po, lt.po: Convert to UTF-8 and merge with newest
--	template.
++	  template.
  
  2003-07-10  Pablo Gonzalo del Campo  <pablodc bigfoot com>
--
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-07-07 Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-06-26  Kostas Papadimas <pkst gmx net>
  
  	* el.po: Greek translation updated by Nikos Charonitakis <charosn her forthnet gr>
  
  2003-06-25  Ivan Stojmirov  <stojmir linux net mk>
--
--	* mk.po: Updated Macedonian translation.
++                                                                                
++        * mk.po: Updated Macedonian translation.
  
  2003-06-25  Kang Jeong-Hee  <Keizi mail co kr>
  
@@@ -11092,13 -11475,13 +10118,13 @@@
  
  2003-06-23  Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-06-23 Marco Ciampa <ciampix libero it>
--
++	
  	* it.po: Updated italian translation.
--
++	
  2003-06-22  Kostas Papadimas <pkst gmx net>
  
  	* el.po: Greek translation updated by Nikos Charonitakis <charosn her forthnet gr>
@@@ -11122,7 -11505,7 +10148,7 @@@
  
  2003-06-18  Andras Timar <timar gnome hu>
  
--	* hu.po: Proofreading: 100%
++        * hu.po: Proofreading: 100%
  
  2003-06-20  Christian Rose  <menthos menthos com>
  
@@@ -11134,9 -11517,9 +10160,9 @@@
  	(Prevod.org).
  
  2003-06-18  Andras Timar <timar gnome hu>
--
--	* hu.po: Translation: 100% reached, Proofreading: 37%
--
++                                                                                                                           
++        * hu.po: Translation: 100% reached, Proofreading: 37%
++                                                                                                                           
  2003-06-19 Wang Jian  <lark linux net cn>
  
  	* zh_CN.po: Updated Simplified Chinese translation by
@@@ -11161,25 -11544,25 +10187,25 @@@
  
  2003-06-18  Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-06-18  Andras Timar <timar gnome hu>
--
--	* hu.po: Updated Hungarian translation.
--
++                                                                                                                           
++        * hu.po: Updated Hungarian translation.
++                                                                                                                           
  2003-06-17  Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation by
--	Francisco Javier F. Serrador <serrador arrakis es>.
++        * es.po: Updated Spanish translation by
++                 Francisco Javier F. Serrador <serrador arrakis es>.
  
  2003-06-16  Fatih Demir <kabalak gtranslator org>
  
  	* tr.po: Committed updated Turkish translation by Gorkem Cetin.
  
  2003-06-16  Andras Timar <timar gnome hu>
--
--	* hu.po: Updated Hungarian translation.
++                                                                                                                           
++        * hu.po: Updated Hungarian translation.
  
  2003-06-15  Vincent van Adrighem  <V vanAdrighem dirck mine nu>
  
@@@ -11196,8 -11579,8 +10222,8 @@@
  
  2003-06-09  Pablo Gonzalo del Campo  <pablodc bigfoot com>
  
--	* es.po: Updated Spanish translation from
--	Francisco Javier Fernandez <serrador arrakis es>.
++	* es.po: Updated Spanish translation from 
++                 Francisco Javier Fernandez <serrador arrakis es>.
  
  2003-06-04  Miloslav Trmac  <mitr volny cz>
  
diff --cc shell/e-shell-importer.c
index 6ce54e8,68ce5ab..8a63934
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@@ -231,13 -241,39 +240,16 @@@ filename_changed (GtkWidget *widget
  }
  
  static void
- item_selected (GtkWidget *item,
- 	       ImportData *data)
+ filetype_changed_cb (GtkWidget *combobox, ImportData *data)
  {
- 	data->filepage->importer = g_object_get_data((GObject *)item, "importer");
- 	filename_changed(data->filepage->filename, data);
+ 	GtkTreeIter iter;
+ 
+ 	g_return_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combobox), &iter));
+ 
+ 	gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (combobox)), &iter, 2, &data->filepage->importer, -1);
+ 	filename_changed (data->filepage->filename, data);
  }
  
 -#if 0
 -static int
 -compare_info_name (const void *data1, const void  *data2)
 -{
 -	const Bonobo_ServerInfo *info1 = (Bonobo_ServerInfo *)data1;
 -	const Bonobo_ServerInfo *info2 = (Bonobo_ServerInfo *)data2;
 -	const char *name1 = get_name_from_component_info (info1);
 -	const char *name2 = get_name_from_component_info (info2);
 -
 -	/* If we can't find a name for a plug-in, its iid will be used
 -	 * for display. Put such plug-ins at the end of the list since
 -	 * their displayed name won't be really user-friendly
 -	 */
 -	if (name1 == NULL) {
 -		return -1;
 -	}
 -	if (name2 == NULL) {
 -		return 1;
 -	}
 -	return g_utf8_collate (name1, name2);
 -}
 -#endif
 -
  static ImportDialogFilePage *
  importer_file_page_new (ImportData *data)
  {
diff --cc widgets/misc/e-filter-bar.c
index dc69b6c,a527569..2125bdf
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@@ -70,23 -115,23 +70,25 @@@ rule_advanced_response (GtkWidget *dial
  			if (!filter_rule_validate (rule))
  				return;
  
 -			efb->current_query = rule;
 +			filter_bar->current_query = rule;
  			g_object_ref (rule);
  
 -			gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 -			gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
 -			gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 -			gtk_widget_modify_base (esb->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 -			e_search_bar_set_text (esb,_("Advanced Search"));
 -			gtk_widget_set_sensitive (esb->clear_button, TRUE);
 +			gtk_widget_modify_base (search_bar->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 +			gtk_widget_modify_text (search_bar->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
 +			gtk_widget_modify_base (search_bar->icon_entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 +			gtk_widget_modify_base (search_bar->viewoption, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
 +			e_search_bar_set_text (search_bar,_("Advanced Search"));
 +			gtk_widget_set_sensitive (search_bar->clear_button, TRUE);
 +
 +			g_signal_emit_by_name (efb, "search_activated");
  
+ 			g_signal_emit_by_name (efb, "search_activated");
+ 
  			if (response == GTK_RESPONSE_APPLY) {
 -				if (!rule_context_find_rule (efb->context, rule->name, rule->source))
 -					rule_context_add_rule (efb->context, rule);
 +				if (!rule_context_find_rule (filter_bar->context, rule->name, rule->source))
 +					rule_context_add_rule (filter_bar->context, rule);
  				/* FIXME: check return */
 -				rule_context_save (efb->context, efb->userrules);
 +				rule_context_save (filter_bar->context, filter_bar->userrules);
  			}
  		}
  	} else {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]