1 files changed, 34 insertions, 1 deletions
diff --git a/data/evolution.convert b/data/evolution.convert
index 6946b0eab3..ecb5236406 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -37,10 +37,21 @@ vpane-position = /apps/evolution/addressbook/display/vpane_position
 
 [org.gnome.evolution.calendar]
 audio-dir = /apps/evolution/calendar/audio_dir
+ba-reminder-interval = /apps/evolution/calendar/other/ba_reminder_interval
+ba-reminder-units = /apps/evolution/calendar/other/ba_reminder_units
+compress-weekend = /apps/evolution/calendar/display/compress_weekend
+confirm-delete = /apps/evolution/calendar/prompts/confirm_delete
+confirm-purge = /apps/evolution/calendar/prompts/confirm_purge
 date-navigator-pane-position = /apps/evolution/calendar/display/date_navigator_pane_position
+day-end-hour = /apps/evolution/calendar/display/day_end_hour
+day-end-minute = /apps/evolution/calendar/display/day_end_minute
+day-start-hour = /apps/evolution/calendar/display/day_start_hour
+day-start-minute = /apps/evolution/calendar/display/day_start_minute
 day-second-zone = /apps/evolution/calendar/display/day_second_zone
 day-second-zones = /apps/evolution/calendar/display/day_second_zones
 day-second-zones-max = /apps/evolution/calendar/display/day_second_zones_max
+default-reminder-interval = /apps/evolution/calendar/other/default_reminder_interval
+default-reminder-units = /apps/evolution/calendar/other/default_reminder_units
 editor-show-categories = /apps/evolution/calendar/display/show_categories
 editor-show-role = /apps/evolution/calendar/display/show_role
 editor-show-rsvp = /apps/evolution/calendar/display/show_rsvp
@@ -52,6 +63,9 @@ hide-completed-tasks-units = /apps/evolution/calendar/tasks/hide_completed_units
 hide-completed-tasks-value = /apps/evolution/calendar/tasks/hide_completed_value
 hpane-position = /apps/evolution/calendar/display/hpane_position
 last-notification-time = /apps/evolution/calendar/notify/last_notification_time
+marcus-bains-color-dayview = /apps/evolution/calendar/display/marcus_bains_color_dayview
+marcus-bains-color-timebar = /apps/evolution/calendar/display/marcus_bains_color_timebar
+marcus-bains-line = /apps/evolution/calendar/display/marcus_bains_line
 memo-hpane-position = /apps/evolution/calendar/display/memo_hpane_position
 memo-layout = /apps/evolution/calendar/display/memo_layout
 memo-vpane-position = /apps/evolution/calendar/display/memo_vpane_position
@@ -59,18 +73,31 @@ month-hpane-position = /apps/evolution/calendar/display/month_hpane_position
 month-scroll-by-week = /apps/evolution/calendar/display/month_scroll_by_week
 notify-programs = /apps/evolution/calendar/notify/programs
 notify-with-tray = /apps/evolution/calendar/notify/notify_with_tray
+primary-calendar = /apps/evolution/calendar/display/primary_calendar
+primary-memos = /apps/evolution/calendar/memos/primary_memos
+primary-tasks = /apps/evolution/calendar/tasks/primary_tasks
+publish-template = /apps/evolution/calendar/publish/template
+recur-events-italic = /apps/evolution/calendar/display/recur_events_italic
 selected-calendars = /apps/evolution/calendar/display/selected_calendars
 selected-memos = /apps/evolution/calendar/memos/selected_memos
 selected-tasks = /apps/evolution/calendar/tasks/selected_tasks
+show-event-end = /apps/evolution/calendar/display/show_event_end
 show-memo-preview = /apps/evolution/calendar/display/show_memo_preview
 show-task-preview = /apps/evolution/calendar/display/show_task_preview
+show-week-numbers = /apps/evolution/calendar/display/show_week_numbers
 tag-vpane-position = /apps/evolution/calendar/display/tag_vpane_position
+task-due-today-color = /apps/evolution/calendar/tasks/colors/due_today
 task-hpane-position = /apps/evolution/calendar/display/task_hpane_position
 task-vpane-position = /apps/evolution/calendar/display/task_vpane_position
 task-layout = /apps/evolution/calendar/display/task_layout
+task-overdue-color = /apps/evolution/calendar/tasks/colors/overdue
+time-divisions = /apps/evolution/calendar/display/time_divisions
 timezone = /apps/evolution/calendar/display/timezone
 use-24hour-format = /apps/evolution/calendar/display/use_24hour_format
+use-ba-reminder = /apps/evolution/calendar/other/use_ba_reminder
+use-default-reminder = /apps/evolution/calendar/other/use_default_reminder
 use-system-timezone = /apps/evolution/calendar/display/use_system_timezone
+week-start-day = /apps/evolution/calendar/display/week_start_day
 working-days = /apps/evolution/calendar/display/working_days
 
 [org.gnome.evolution.importer]
@@ -86,6 +113,7 @@ charset = /apps/evolution/mail/display/charset
 citation-colour = /apps/evolution/mail/display/citation_colour
 composer-charset = /apps/evolution/mail/composer/charset
 composer-current-folder = /apps/evolution/mail/composer/current_folder
+composer-gallery-path = /apps/evolution/mail/composer/gallery_path
 composer-group-reply-to-list = /apps/evolution/mail/composer/group_reply_to_list
 composer-height = /apps/evolution/mail/composer/height
 composer-ignore-list-reply-to = /apps/evolution/mail/composer/ignore_list_reply_to
@@ -96,6 +124,7 @@ composer-message-attribution = /apps/evolution/mail/composer/message_attribution
 composer-message-forward = /apps/evolution/mail/composer/message_forward
 composer-message-original = /apps/evolution/mail/composer/message_original
 composer-no-signature-delim = /apps/evolution/mail/composer/no_signature_delim
+composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames
 composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom
 composer-request-receipt = /apps/evolution/mail/composer/request_receipt
 composer-send-html = /apps/evolution/mail/composer/send_html
@@ -106,10 +135,10 @@ composer-show-cc = /apps/evolution/mail/composer/show_mail_cc
 composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to
 composer-show-post-from = /apps/evolution/mail/composer/show_post_from
 composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to
-composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames
 composer-top-signature = /apps/evolution/mail/composer/top_signature
 composer-width = /apps/evolution/mail/composer/width
 default-account = /apps/evolution/mail/default_account
+enable-local = /apps/evolution/mail/display/enable_local
 enable-vfolders = /apps/evolution/mail/display/enable_vfolders
 error-level = /apps/evolution/mail/display/error_level
 error-timeout = /apps/evolution/mail/display/error_timeout
@@ -154,6 +183,7 @@ mime-types = /apps/evolution/mail/display/mime_types
 monospace-font = /apps/evolution/mail/display/fonts/monospace
 no-folder-dots = /apps/evolution/mail/display/no_folder_dots
 paned-size = /apps/evolution/mail/display/paned_size
+paned-view-headers-state = /apps/evolution/mail/display/paned_view_headers_state
 photo-local = /apps/evolution/mail/display/photo_local
 prompt-check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
 prompt-on-delete-in-vfolder = /apps/evolution/mail/prompts/delete_in_vfolder
@@ -174,6 +204,8 @@ save-dir = /apps/evolution/mail/save_dir
 safe-list = /apps/evolution/mail/display/safe_list
 send-recv-height = /apps/evolution/mail/send_recv_height
 send-recv-maximized = /apps/evolution/mail/send_recv_maximized
+send-recv-on-start = /apps/evolution/mail/send_recv_on_start
+send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start
 send-recv-width = /apps/evolution/mail/send_recv_width
 show-all-headers = /apps/evolution/mail/display/show_all_headers
 show-animated-images = /apps/evolution/mail/display/animated_images
@@ -182,6 +214,7 @@ show-email = /apps/evolution/mail/display/show_email
 show-real-date = /apps/evolution/mail/display/show_real_date
 show-sender-photo = /apps/evolution/mail/display/sender_photo
 side-bar-search = /apps/evolution/mail/display/side_bar_search
+sort-accounts-alpha = /apps/evolution/mail/display/sort_accounts_alpha
 subscription-editor-height = /apps/evolution/mail/subscription_editor_height
 subscription-editor-maximized = /apps/evolution/mail/subscription_editor_maximized
 subscription-editor-width = /apps/evolution/mail/subscription_editor_width