[evolution/wip/gsettings] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit e81c885577cf382703a2b8ae8a0b81f80e4d9f91
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Aug 13 15:33:06 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1664 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1664 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1672 insertions(+), 1656 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 57a6ffe..2cef168 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-29 16:02+0800\n"
-"PO-Revision-Date: 2011-07-29 16:02+0800\n"
+"POT-Creation-Date: 2011-08-13 15:31+0800\n"
+"PO-Revision-Date: 2011-08-13 15:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -218,7 +218,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "éæåå Evolution äåïçæäç {0} çèçäã"
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "åå(_A)"
@@ -263,7 +263,7 @@ msgid "Blog:"
 msgstr "éèæï"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "åé(_T)â"
@@ -403,7 +403,7 @@ msgstr "éèæ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
@@ -893,7 +893,7 @@ msgid "Car Phone"
 msgstr "æèéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1142,17 +1142,17 @@ msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:435
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:437
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
@@ -1256,7 +1256,7 @@ msgid "Blog"
 msgstr "éèæ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1229
-#: ../widgets/misc/e-web-view.c:954
+#: ../widgets/misc/e-web-view.c:976
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
@@ -1438,8 +1438,8 @@ msgstr "çæååéèéæåï%s"
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/event-page.c:2893
 #: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2314
+#: ../mail/em-folder-tree.c:692 ../mail/mail-ops.c:657
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:313
@@ -1870,7 +1870,7 @@ msgid "_Save Changes"
 msgstr "ååææ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1893,7 +1893,7 @@ msgstr[0] "åæ"
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
 msgstr[0] "å"
@@ -1978,8 +1978,8 @@ msgstr "ææåççåéèèã"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "äæ %d åéé"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1780
@@ -2092,7 +2092,7 @@ msgid "Classification"
 msgstr "æé"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:492
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æå"
@@ -2134,13 +2134,13 @@ msgid "Organizer"
 msgstr "æèåéä"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
 #: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
@@ -2187,8 +2187,8 @@ msgid "is not"
 msgstr "äæ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "çèéé"
+msgid "Edit Reminder"
+msgstr "çèæé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2211,30 +2211,30 @@ msgid "Send an email"
 msgstr "åééåéä"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "æåéé"
+msgid "Add Reminder"
+msgstr "ååæé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "éé"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "èéèæ(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "èéééèé"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "èéæéèé"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "éé"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "æé"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "éè"
@@ -2256,8 +2256,8 @@ msgid "_Program:"
 msgstr "åèçå(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "éèéé(_R)"
+msgid "_Repeat the reminder"
+msgstr "éèéåæé(_R)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2279,7 +2279,7 @@ msgstr "å"
 msgid "end of appointment"
 msgstr "çæçæ"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "æéééæ"
@@ -2305,10 +2305,10 @@ msgid "A_dd"
 msgstr "åå(_A)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "éé"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "Reminders"
+msgstr "æé"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
@@ -2347,15 +2347,16 @@ msgstr "éè(_R):"
 #: ../calendar/gui/dialogs/calendar-setup.c:417
 #: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2960
+#: ../plugins/itip-formatter/itip-formatter.c:2974
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "äè"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:407
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "åäæå"
 
@@ -2363,27 +2364,27 @@ msgstr "åäæå"
 msgid "Memo List"
 msgstr "ååéæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "iCalendar éè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "æèäæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
 msgstr "æååäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "ååéæååæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
 msgstr "æåååéæå"
 
@@ -2486,21 +2487,21 @@ msgid "Close the current window"
 msgstr "ééçåçèç"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1302
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1296
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
@@ -2510,9 +2511,9 @@ msgid "View help"
 msgstr "æèæå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1308
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
@@ -2521,7 +2522,7 @@ msgid "Save current changes"
 msgstr "ååçåçææ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
@@ -2534,19 +2535,19 @@ msgstr "æé(_C)"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -2560,7 +2561,7 @@ msgid "_Options"
 msgstr "éé(_O)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
@@ -2773,12 +2774,12 @@ msgid "Enter Delegate"
 msgstr "èåäè"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "éé(_A)"
+msgid "_Reminders"
+msgstr "æé(_R)"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Set or unset alarms for this event"
-msgstr "èåæåæéåääçéé"
+msgid "Set or unset reminders for this event"
+msgstr "èåæåæéåääçæé"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2822,12 +2823,12 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "çæ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "åæè"
@@ -2850,11 +2851,11 @@ msgstr "äèåæççèääïåçääæåéä"
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
-msgstr "éåääåæéé"
+msgid "This event has reminders"
+msgstr "éåääåææé"
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
@@ -2869,7 +2870,7 @@ msgstr "ççæææçää"
 
 #: ../calendar/gui/dialogs/event-page.c:1430
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
@@ -2887,12 +2888,12 @@ msgstr "çææééè"
 
 #: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
 #: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
@@ -2917,7 +2918,7 @@ msgstr "çæéåèäæã%sãï%s"
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2939
 #: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "äææä %s çäçä"
@@ -2944,47 +2945,47 @@ msgstr[0] "çæå %d åé"
 msgid "Customize"
 msgstr "èé"
 
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "åæè(_N)â"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "èééé:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "èéæéï"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ääæè"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "æå(_Z):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "éé(_A)"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "æè(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "äç(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "æé(_R)"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "æè(_S):"
@@ -2993,19 +2994,19 @@ msgstr "æè(_S):"
 msgid "_Time:"
 msgstr "æå(_T):"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "çæå 1 å"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "çæå 1 åæ"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3080,7 +3081,7 @@ msgstr "éæäå(_T)"
 msgid "September"
 msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "ååé"
 
@@ -3106,8 +3107,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "çæåã%sãéåååéï%s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "æäè"
@@ -3129,8 +3130,8 @@ msgstr "æäè(_O):"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "çç(_G):"
+msgid "_List:"
+msgstr "æå(_L):"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3168,21 +3169,21 @@ msgstr "æäéåäåçäé"
 msgid "All Instances"
 msgstr "ææäé"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution çæçèéåéææçæã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "éææææçæ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr "éææääççææåææéåæå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "ç"
 
@@ -3190,7 +3191,7 @@ msgstr "ç"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "ä"
 
@@ -3199,7 +3200,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "ä"
 
@@ -3207,7 +3208,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "ä"
 
@@ -3215,7 +3216,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "å"
 
@@ -3223,7 +3224,7 @@ msgstr "å"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "çä"
 
@@ -3231,13 +3232,13 @@ msgstr "çä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "æå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "åäææ"
 
@@ -3245,7 +3246,7 @@ msgstr "åäææ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "1æè10æ"
 
@@ -3253,7 +3254,7 @@ msgstr "1æè10æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "11æè20æ"
 
@@ -3261,73 +3262,73 @@ msgstr "11æè20æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "21æè31æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "æææ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "åç"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2138
 msgid "Add exception"
 msgstr "ååäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Could not get a selection to modify."
 msgstr "çæååèçèçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2185
 msgid "Modify exception"
 msgstr "çèäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2229
 msgid "Could not get a selection to delete."
 msgstr "çæååèåéçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2363
 msgid "Date/Time"
 msgstr "ææ/æé"
 
@@ -3390,8 +3391,8 @@ msgid "year(s)"
 msgstr "å"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "åæçééèéåäääèéå"
+msgid "Send my reminders with this event"
+msgstr "åæçæéèéåäääèéå"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
@@ -3412,7 +3413,7 @@ msgstr "çé"
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
 #: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3425,7 +3426,7 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3271
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 msgid "Completed"
 msgstr "ååæ"
@@ -3445,7 +3446,7 @@ msgstr "é"
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
 #: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "éèä"
 
@@ -3460,7 +3461,7 @@ msgstr "ä"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:515
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3472,7 +3473,7 @@ msgstr "äè"
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
 #: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3528,7 +3529,7 @@ msgstr "æéèæè/æèèåäççæèçèæ"
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "åä"
@@ -3562,11 +3563,11 @@ msgstr "äèåæççèåäïåçääæåéä"
 msgid "Organi_zer:"
 msgstr "æèåéä(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
 msgstr "åææéè"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "çæåã%sãéååäï%s"
@@ -3744,39 +3745,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2631
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2794
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3849,14 +3850,14 @@ msgstr "ææçä"
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2619
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2625
 msgid "Declined"
 msgstr "åæ"
 
@@ -3870,7 +3871,7 @@ msgstr "æè"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2628
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -3897,7 +3898,7 @@ msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3942,7 +3943,7 @@ msgstr "éççäæå"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
@@ -3975,7 +3976,7 @@ msgstr "%mæ%dæ%A"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1015
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
@@ -3987,7 +3988,7 @@ msgstr "%mæ%dæ (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1081
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
@@ -4321,8 +4322,8 @@ msgid "%d %B"
 msgstr "%mæ%dæ"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "ååæééã"
+msgid "It has reminders."
+msgstr "ååææéã"
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4417,16 +4418,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1011
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1024
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1048
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
@@ -4434,10 +4435,10 @@ msgstr "%Yå%mæ%dæ (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1044
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1074
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
@@ -4467,7 +4468,7 @@ msgstr "çææçèäææè"
 msgid "calendar view for one or more weeks"
 msgstr "çæäæåéçèäææè"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2219
 msgid "Purging"
 msgstr "æé"
 
@@ -4747,71 +4748,71 @@ msgstr "å"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " å "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (ååæ) "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "ååæ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr "(æé)"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "èçä: "
 
@@ -4842,7 +4843,7 @@ msgstr "çæåæè"
 
 #: ../calendar/importers/icalendar-importer.c:411
 #: ../calendar/importers/icalendar-importer.c:821
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../plugins/itip-formatter/itip-formatter.c:2108
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
@@ -4910,8 +4911,8 @@ msgstr "æäååé"
 
 #: ../calendar/importers/icalendar-importer.c:1098
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "åæéé"
+msgid "has reminders"
+msgstr "åææé"
 
 #: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
@@ -6589,7 +6590,7 @@ msgstr "æåæéä(_M)"
 msgid "Open New Message window"
 msgstr "éåæçéäèç"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "èå Evolution"
 
@@ -6808,11 +6809,11 @@ msgstr "çæååéåçéäïææèåååèæ(æåè)"
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4155
+#: ../composer/e-msg-composer.c:4203
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4860
+#: ../composer/e-msg-composer.c:4908
 msgid "Untitled Message"
 msgstr "æååçéä"
 
@@ -6908,7 +6909,7 @@ msgstr "ååéäååäåã"
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ææã{0}ãäæäèææèäçæåéääåéã"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "ååçéèç &quot;{0}&quot;ã"
 
@@ -7078,7 +7079,7 @@ msgid ""
 msgstr "åæååèäéçåäæåååéäåææäéçæéã"
 
 #: ../capplet/settings/mail-account-view.c:633
-#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2315
+#: ../mail/em-account-editor.c:2196 ../mail/em-account-editor.c:2329
 msgid "Identity"
 msgstr "èå"
 
@@ -7130,7 +7131,7 @@ msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
 #: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3202
+#: ../mail/em-account-editor.c:3306
 msgid "Defaults"
 msgstr "éèå"
 
@@ -7255,7 +7256,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution éäèèäæ"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Groupware åèèä"
 
@@ -7525,7 +7526,7 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
@@ -7558,14 +7559,14 @@ msgid "Reply-To"
 msgstr "åè"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
-#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "åæ"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
-#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "åäåæ"
 
@@ -7577,7 +7578,7 @@ msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
 #: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "åäè"
@@ -7794,8 +7795,8 @@ msgid "No reply or parent"
 msgstr "ææååæååéä"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
-msgstr "åæéäçç(_N)"
+msgid "I_nclude threads:"
+msgstr "åæéäçç(_N):"
 
 #: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
@@ -7838,7 +7839,7 @@ msgstr "çåææã"
 msgid "Missing file name."
 msgstr "çåææåçã"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -7978,11 +7979,11 @@ msgctxt "mail-receiving"
 msgid "None"
 msgstr "ææ"
 
-#: ../mail/em-account-editor.c:2179
+#: ../mail/em-account-editor.c:2193
 msgid "Mail Configuration"
 msgstr "éäçæ"
 
-#: ../mail/em-account-editor.c:2180
+#: ../mail/em-account-editor.c:2194
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -7992,36 +7993,36 @@ msgstr ""
 "\n"
 "æääãççãéåã "
 
-#: ../mail/em-account-editor.c:2183
+#: ../mail/em-account-editor.c:2197
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr "èåäéèåäçåçåééååããéææãçæäääåèåïééäåæåéåçéäåååéäèèã"
 
-#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2374
+#: ../mail/em-account-editor.c:2199 ../mail/em-account-editor.c:2388
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
-#: ../mail/em-account-editor.c:2186
+#: ../mail/em-account-editor.c:2200
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2898
+#: ../mail/em-account-editor.c:2202 ../mail/em-account-editor.c:3000
 msgid "Sending Email"
 msgstr "åééåéä"
 
-#: ../mail/em-account-editor.c:2189
+#: ../mail/em-account-editor.c:2203
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "èèåääéæåééäæåçèèãåæääææïèèçççççåæççæåäæåã"
 
-#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2205 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "åèèè"
 
-#: ../mail/em-account-editor.c:2192
+#: ../mail/em-account-editor.c:2206
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8029,11 +8030,11 @@ msgstr ""
 "èåäéççéèåæèéååèçåçã\n"
 "éååçåååçéçäçã"
 
-#: ../mail/em-account-editor.c:2196
+#: ../mail/em-account-editor.c:2210
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/em-account-editor.c:2197
+#: ../mail/em-account-editor.c:2211
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8047,34 +8048,30 @@ msgstr ""
 "\n"
 "èæääãåçãååèåã"
 
-#: ../mail/em-account-editor.c:2696
+#: ../mail/em-account-editor.c:2729
 msgid "Check for _new messages every"
 msgstr "èåæææéäæ(_N)"
 
-#: ../mail/em-account-editor.c:2704
+#: ../mail/em-account-editor.c:2737
 msgid "minu_tes"
 msgstr "åé(_T)"
 
-#: ../mail/em-account-editor.c:3015
-msgid "Please select a folder from the current account."
-msgstr "èéæçååèçèæåã"
-
-#: ../mail/em-account-editor.c:3341 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3445 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "ååæ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3395 ../mail/em-account-editor.c:3478
+#: ../mail/em-account-editor.c:3499 ../mail/em-account-editor.c:3582
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:3396 ../mail/em-account-editor.c:3479
+#: ../mail/em-account-editor.c:3500 ../mail/em-account-editor.c:3583
 msgid "Checking for New Messages"
 msgstr "æææéä"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1381 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8091,9 +8088,9 @@ msgstr "åçæè"
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ééæèç"
 
@@ -8168,7 +8165,7 @@ msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:583
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
@@ -8238,28 +8235,28 @@ msgstr "åç"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
 #: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "æäå"
 
 #: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "èç"
 
 #: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "åäå"
 
 #: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "ååé"
 
 #: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8303,578 +8300,578 @@ msgstr "çæåã%sãåçæåéäèæåï%s"
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:481
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:481
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "æåéä"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "éèéèæåçéä"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
 #: ../modules/calendar/e-cal-shell-view-actions.c:1477
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "åççç(_A)"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
 msgstr "éäèåæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
 msgstr "åæäèæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
 msgstr "åäèæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
 msgstr "äææåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3237 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:306
 #: ../plugins/google-account-setup/google-source.c:549
 #: ../plugins/google-account-setup/google-source.c:688
@@ -8882,44 +8879,44 @@ msgstr "æåååéäã%sã"
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3404
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3405
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3424
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3425
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3478 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3503
+#: ../mail/e-mail-reader.c:3511
 #: ../modules/calendar/e-cal-shell-view-actions.c:1323
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3507
+#: ../mail/e-mail-reader.c:3515
 #: ../modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3524 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4194
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -8940,7 +8937,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "èæåã%sãåå %u åéèçéäãäçåèåéåï"
 
-#: ../mail/e-mail-reader-utils.c:960
+#: ../mail/e-mail-reader-utils.c:1034
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ååéä"
@@ -8950,7 +8947,7 @@ msgstr[0] "ååéä"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:981
+#: ../mail/e-mail-reader-utils.c:1055
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "éä"
@@ -9073,11 +9070,11 @@ msgstr "éééçïã%sã"
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2937
+#: ../mail/em-composer-utils.c:2941
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2938
+#: ../mail/em-composer-utils.c:2942
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -9360,53 +9357,53 @@ msgstr "éåçé"
 msgid "Folder Properties"
 msgstr "èæååå"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<æéèéæèæå>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:661
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:781
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1603
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2082 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2092 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2096 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2115
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -9428,212 +9425,224 @@ msgstr "äçå"
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:482
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:482
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:562
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:563
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "æååéä"
 
-#: ../mail/em-format-html.c:368
+#: ../mail/em-format-html.c:378
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "æçç"
 
-#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "ææççç"
 
-#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "çæççç"
 
-#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "ççææïäæçææéåäè"
 
-#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåéåçå"
 
-#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html.c:2110
+#: ../mail/em-format-html.c:2120
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:2120
+#: ../mail/em-format-html.c:2130
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2151
+#: ../mail/em-format-html.c:2161
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2162
+#: ../mail/em-format-html.c:2172
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2164
+#: ../mail/em-format-html.c:2174
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2185
+#: ../mail/em-format-html.c:2195
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2200
+#: ../mail/em-format-html.c:2210
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2905
+#: ../mail/em-format-html.c:2915
 #: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "åäèï%s"
 
-#: ../mail/em-format-html.c:2927
+#: ../mail/em-format-html.c:2937
 msgid "(no subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/em-format-html.c:3003
+#: ../mail/em-format-html.c:3013
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æéäæççãääèæéäåéèã"
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "æéäåççèäææïèçåéåæåèæéèçéäã"
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "éäççççææéïåèåååéæèæåäã"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "æéäæäåææçççïäæéäçåäèçææéã"
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æéäæäåææçççïäæææåæçåéåçåã"
 
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æéäæååãåçåååééäèçåéåèæèæéã"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr "æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääææïääæçææèæéäçååã"
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "æéäåååãåéçäéäæèæéäçååã"
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéäçååã"
 
-#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèèæ(_V)"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "æèæçææè"
 
-#: ../mail/em-format-html-display.c:552
+#: ../mail/em-format-html-display.c:556
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
 msgstr "Evolution çæéçæåéåéäïåçååèåèèççååãäåäçäæççæåæäçåéæåçèåäéèåã"
 
-#: ../mail/em-format-html-display.c:848
+#: ../mail/em-format-html-display.c:740
+msgid "Save Image"
+msgstr "åååç"
+
+#: ../mail/em-format-html-display.c:786
+msgid "Save _Image..."
+msgstr "åååç(_I)â"
+
+#: ../mail/em-format-html-display.c:788
+msgid "Save the image to a file"
+msgstr "ååçååçææ"
+
+#: ../mail/em-format-html-display.c:1010
 msgid "Completed on"
 msgstr "ååææ"
 
-#: ../mail/em-format-html-display.c:860
+#: ../mail/em-format-html-display.c:1022
 msgid "Overdue:"
 msgstr "åææ:"
 
-#: ../mail/em-format-html-display.c:868
+#: ../mail/em-format-html-display.c:1030
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1306 ../mail/em-format-html-display.c:1353
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1144
+#: ../mail/em-format-html-display.c:1308
 msgid "Hide _Unformatted"
 msgstr "éèææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1209
+#: ../mail/em-format-html-display.c:1373
 msgid "O_pen With"
 msgstr "äâéå(_O)"
 
@@ -9734,7 +9743,7 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "ååèæå"
 
@@ -9791,7 +9800,7 @@ msgid "Always request read receipt"
 msgstr "äåèæèäåæ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "éèèæåçæåäéççæé(ç)ã"
 
@@ -10247,7 +10256,7 @@ msgid "Layout style"
 msgstr "éçæå"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "æèéçéäççã"
 
@@ -10851,7 +10860,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "éä"
@@ -10871,13 +10880,13 @@ msgstr "çççèæå(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "éæèæå"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
@@ -10907,8 +10916,7 @@ msgstr "æåååäç"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "æåååã%sã"
@@ -11091,7 +11099,7 @@ msgid "Confirmations"
 msgstr "çè"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
@@ -12131,54 +12139,59 @@ msgid "Failed to open folder."
 msgstr "çæéåèæåã"
 
 #: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "çæåäæåæèææçéèæçææåã"
+
+#: ../mail/mail.error.xml.h:67
 msgid "Failed to remove attachments from messages."
 msgstr "çæçééääçéäã"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
 msgstr "çæååéäã"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
 msgstr "çæåéåçéäååèççã"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åæäéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "åæäåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åæäéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12186,33 +12199,33 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "åæäéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12220,48 +12233,48 @@ msgid ""
 "recipient."
 msgstr "ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåæååäææéïææéåçéääææçæäèãèéåæææïæèèåæåäåãæäèïãæãåæïãæäèã"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr "åæåèæåäéççéäääæèæãåæåèæåäåééäåæèäçæåæéçèæååéåéçéäãæåçåèåééäéäï"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "éæèæåã"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "æä(_E)"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "æäåéèçéäã"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "æéåäæã"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "äæéåéåéäåèæèèèåæéã"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "èææåèèåäåèäæã"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "èåçèåèæäçåäåèåéã"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr "èåãæäèïãæäèåäåææçéåéäååãäåäæääèåæåæéçãæäèïãæéïæåéåéäååã"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12270,69 +12283,69 @@ msgstr ""
 "èçåääæäèåæääåäææ HTML éåéäï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "èèååäèèéåçåæçççåçã"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "èçåã"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "èçèéäèæåã{0}ãççåéã"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "åäæåæèææçéèæçææåã"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "èæèäåæã"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "çåèåéèæåã{0}ãï"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "æåçééèçéäï"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "çäåè(_P)"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "æåèæåèåææã"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "æååéçäåèï"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "æååèçææçæäèï"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "çåæåçåå"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æååæèæåääéçäçï"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæåéã"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12345,7 +12358,7 @@ msgstr ""
 "\n"
 "ååéåéäççææå Apparently-To æéèåæåäåææäèçéäãåææåææéïæåçéääææçæäèãèéåæææïäæèèåæåäåãæäèïãæãåæïãæäèã "
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12353,7 +12366,7 @@ msgstr ""
 "äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12361,15 +12374,15 @@ msgstr ""
 "äåæäèçæèèçææçéåéäååï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "åäçææåéååèäåäåèã"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
 msgstr "éäéääæèæã"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12377,112 +12390,112 @@ msgstr ""
 "æèæååèåçèåæåã\n"
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "åçäææåçéæçäåéçåèïæäçæåéæéäã"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "åçäæææåääæäèïæäçæåéæéä"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "æççåçææïäåæååã"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "éæåæçéåçèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "çæéçè GroupWise äæåã"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "çæèåææææã"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
 msgstr "çæææéäã"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "äçéèå(_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "äçéèçèçèæåï"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "äæèéééäèçåï"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
 "you sure you want to proceed?"
 msgstr "äæäçäåèäèéäèåçéäïäæéåéäèååèåäçåäååèåãäçåèççåï"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
 "proceed?"
 msgstr "äæååèäèéäèåçéäïäæääçäåèæååçååäèïèéååéäèåãäçåèççåï"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "äæååèçääæåéçèåæäèãäçååäçäååéï"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "äææèåçæéåéæåéäã"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "äææååææåéçèèã"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "äææååçéäïäçèåäéèééåï"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "ääèççåçåçåçåååèã"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "äåéååææåèæåã"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "äåéæåäåèæåã"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12491,65 +12504,65 @@ msgstr ""
 "äåéèåæåäåèæåçæäæã\n"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "äçåäæåã{0}ãçåèçã{0}ãïäåæäã"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "çæ(_A)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "æå(_A)"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "ææææ(_D)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:158
 #: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "çæ _Evolution "
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "çåèç(_M)"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "æ(_Y)"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
 msgstr "{0}"
 
@@ -12776,11 +12789,11 @@ msgstr "æåæå"
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1274
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -12875,16 +12888,16 @@ msgid "Whether to show the preview pane."
 msgstr "æåéçéèçæã"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:184
 #: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "èååæ"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "æééçèåèéçèçääå(_S)"
 
@@ -13373,6 +13386,10 @@ msgstr "30 åé"
 msgid "60 minutes"
 msgstr "60 åé"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "éé"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "èç"
@@ -13394,8 +13411,8 @@ msgid "Display"
 msgstr "éç"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "ååéçååäéçéé(_N)"
+msgid "Display reminders in _notification area only"
+msgstr "ååéçååäéçæé(_N)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Hours"
@@ -13406,411 +13423,411 @@ msgid "Minutes"
 msgstr "åé"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "éæ(_U)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "äéæåææè(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "çäæå(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "éæéééççèäæ"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "Select the calendars for reminder notification"
+msgstr "éææééççèäæ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "éçæéæçæ(_O)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "éçæé(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "ååäèäæäåéææäääæééç(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "éçéæ(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "äååæçåä(_A):"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "éå(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "ææ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æé"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "æåæå:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "äçççæå(_Y)"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "äééåæ(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 #: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "åäé"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "åäæ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 åæ (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 åæ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "çåééçæåçè(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "åææèåçåéæéç(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "äæéåæ(_D):"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "éä(_F)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "éèååæçåä(_H)"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "éä(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "éæçåä(_O):"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "éå(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "åéåæçæèåéççæççææé(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "æééé(_T):"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "éä(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "éä(_W)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "åæåéåçåæ/çæäå"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "å"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ééçå"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "çåééçæåçè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "äååæçåäèæèåïäç \"#rrggbb\" æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "éæåäçèæèåïäç \"#rrggbb\" æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "çæåéåçåææé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "çæåéåçåææéåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "çæåéåçåææéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "åèééçèäæ"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "åèæéçèäæ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "åæååäçäçè Marcus Bains ççèå(ççèçäçéèå)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "åææèäçäçè Marcus Bains ççèå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "åææèåçåéæéç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "æçæçè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "åéææåäæéåèçææåæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "éèççææé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "éèæéçåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "éèæéçæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "çäåæéééææççé"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "çäåææééææççé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "çé/åçäæåçå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "çé/åççæçå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "éèååæçåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "éèåäåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "éèåäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "æåçæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "åäæçææåéïä 24 åææåï0 è 23ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "åäæéåæåéïä 24 åææåï0 è 23ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "åæçãtrueãïååäèçäéçååééèçæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "åæçãtrueãïååäèçäéçåäéèçæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "åãæãåãåäéãæèäéçééïäåéèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "äæééæå"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "äææéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "æèåææèääçççäæåæåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "çæçé/åççåçäæå URL æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains çèåâææè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains çèåâæåå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "åãday_second_zonesãæåäèèäçæèäçæåæççæååã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "èèäçæèäçæåæççæååã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "ååééçæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "ååééèçæäçïæåï"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "ååééèçæäçïåçï"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "åäæçæåéï0 å 59ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "åäæéååéï0 å 59ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "ææèçæåçæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "ææèçåççæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "æåçææéåçåææéçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "æåéèæéçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "æåäæéèåäçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "æåçæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "æåçåçæååééèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "æåçæåæåäéèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "æåçåçæåäéèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "åççæçäçïåèäææåèææåèèäæäéã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "åççæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr "åççæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "äèèäæ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "äèååéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "äèåäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "çäåçééèåèççåã"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "çäåçæéèåèççåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "æèåææèääçççäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "éææäääæééç"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "æéçåéçå"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "ååéééææçé"
+msgid "Save directory for reminder audio"
+msgstr "ååæééææçé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -13837,8 +13854,8 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr "ååäèäæäåéææääéååäæééçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "åéçåäéçééçé"
+msgid "Show display reminders in notification tray"
+msgstr "åéçåäéçæéçé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -13946,8 +13963,8 @@ msgid "Time divisions"
 msgstr "æéåé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "äæééåèçæé(_T)"
+msgid "Time the last reminder ran, in time_t."
+msgstr "äææéåèçæé(_T)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -13993,8 +14010,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æéçéåïåæææ (0) åææå (6)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "æåäçéçåéçééã"
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "æåäçéçåéçæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14110,8 +14127,8 @@ msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
 #: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "éæééèäæ"
+msgid "Selected Calendars for Reminders"
+msgstr "éææéèäæ"
 
 #: ../modules/calendar/e-calendar-preferences.c:840
 msgid "Ti_me and date:"
@@ -14180,7 +14197,6 @@ msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
 #: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2951
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
@@ -14875,11 +14891,11 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
 
-#: ../modules/mail/em-account-prefs.c:218
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution åèåç"
 
-#: ../modules/mail/em-account-prefs.c:267
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "åèçèå"
 
@@ -14924,7 +14940,7 @@ msgid "Network Preferences"
 msgstr "ççååèå"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
@@ -15215,72 +15231,72 @@ msgstr "çåçåè"
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "ææçåèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:732
+#: ../modules/mail/e-mail-shell-view.c:736
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:943
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -15474,39 +15490,39 @@ msgstr "åäçæåååéäæèã"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "åäçæåååéäæè (ææ DNS)ã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "èéæäæèååçèèï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "äè %sï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:324
-#: ../modules/startup-wizard/evolution-startup-wizard.c:422
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr "æåååææ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:400
+#: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:492
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "Evolution èååç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
 msgstr "æèäç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15517,7 +15533,7 @@ msgstr ""
 "\n"
 "èæääãääæãæéççã "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -16488,176 +16504,180 @@ msgstr "çæåääåäæåäæåééåä"
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1040
 msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1043
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1316
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1532
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1674
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1719
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1722
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1725
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1790
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1795
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1853
+#: ../plugins/itip-formatter/itip-formatter.c:1864
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1854
+#: ../plugins/itip-formatter/itip-formatter.c:1865
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1905
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1906
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:1948
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2622
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2740
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2743
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2746
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2965
+msgid "Meeting invitations"
+msgstr "æèéè"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2976
+#: ../plugins/itip-formatter/itip-formatter.c:2990
 msgid "_Delete message after acting"
 msgstr "åæååééä(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2986
-#: ../plugins/itip-formatter/itip-formatter.c:3019
+#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3033
 msgid "Conflict Search"
 msgstr "èççæå"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3015
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "éæèæåæèèççèäæ"
 
@@ -17639,35 +17659,31 @@ msgstr "Outlook PST åå"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook åäèæå (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "éä(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "ççåèæå:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "éèé(_A)"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "çæ(_P)"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
 msgstr "æèéç(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
 msgstr "åå Outlook èæ"
 
@@ -18371,7 +18387,7 @@ msgstr "ååäçèäéçæ"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -18382,278 +18398,270 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution çç"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
 msgstr "åéçèå"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "åæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "çæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "éç Evolution çéèè"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "ééèç(_C)"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "éå Evolution äçèæå"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "éååèåé(FAQ)çé"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "éååç(_F)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "åèææèæçåç"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "åå(_M)â"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "åååäçåçèæ"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "éæèç(_W)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "åçäåæçèçäéçéåæè"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
 msgstr "åççåé(_G)"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr "ççåççåé"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "åéååèå(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "éç Evolution çæåé"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "éééåçå"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "ééæå(_A)â"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "åçæééçæå"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "æéçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "çèååçæåçæ(_E)â"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "ççäåååçæå"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "æéèäæèæåéå"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "çåæå(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "åèçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "ååæåçæ(_S)â"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "ååçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "åééèåå(_B)â"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "äç Bug Buddy éåéèååã"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "éçåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "è Evolution éåéçæå"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "çäåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "è Evolution éåäçæå"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "äå(_O)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "æå(_N)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "æå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "åæåè(_S)"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "èç(_O)"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "éçåéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "éçåéå"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "éçæé(_B)"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "éçåæçåæé"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "éççæå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "éççæå"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "éçååå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "éçååå"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "åæåç(_I)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "åéçèçæéçåç"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "åææå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "åéçèçæéçæå"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "åçåæå(_A)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "éçèçæéçåçåæå"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "åååéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "äçæéåååèååéçèçæé"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "åçæèâ"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "åçæçèæè(_C)"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "ååèéæèâ"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "ååçåçèéæè"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "çåæè(_U)"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "èéæè"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "çåçæèæåæèéçæè"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "äæçåæåæçééæåèå"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "åæè %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
@@ -20200,49 +20208,49 @@ msgstr "åäçåéçååèæã"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
 msgstr "èèåç(_C)"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
 msgstr "èèåçååèè"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1314
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:978 ../widgets/misc/e-web-view.c:980
+#: ../widgets/misc/e-web-view.c:982
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:984
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index be176f1..07f98af 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 3.1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-29 16:02+0800\n"
-"PO-Revision-Date: 2011-07-29 11:57+0800\n"
+"POT-Creation-Date: 2011-08-13 15:31+0800\n"
+"PO-Revision-Date: 2011-08-13 14:38+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: zh_TW\n"
@@ -231,7 +231,7 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "éæåå Evolution äåïçæäç {0} çéçäã"
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "åå(_A)"
@@ -276,7 +276,7 @@ msgid "Blog:"
 msgstr "éèæï"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "åé(_T)â"
@@ -416,7 +416,7 @@ msgstr "éèæ(_B):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "èäæ(_C):"
@@ -906,7 +906,7 @@ msgid "Car Phone"
 msgstr "æèéè"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1155,17 +1155,17 @@ msgid "Copy _Email Address"
 msgstr "èèéåéääå(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:184
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "èèéåéääåååèç"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:189
-#: ../widgets/misc/e-web-view.c:435
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "åéæéäè(_S)â"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:191
-#: ../widgets/misc/e-web-view.c:437
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "åééäåéåäå"
 
@@ -1269,7 +1269,7 @@ msgid "Blog"
 msgstr "éèæ"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:1229
-#: ../widgets/misc/e-web-view.c:954
+#: ../widgets/misc/e-web-view.c:976
 #, c-format
 msgid "Click to mail %s"
 msgstr "æäääåééä %s"
@@ -1456,8 +1456,8 @@ msgstr "çæååéèéæåï%s"
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/event-page.c:2893
 #: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2314
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2314
+#: ../mail/em-folder-tree.c:692 ../mail/mail-ops.c:657
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
 #: ../smime/gui/certificate-manager.c:313
@@ -1892,7 +1892,7 @@ msgid "_Save Changes"
 msgstr "ååèæ(_S)"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "åé(_S)"
@@ -1915,7 +1915,7 @@ msgstr[0] "åæ"
 #. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
 msgstr[0] "å"
@@ -2000,8 +2000,8 @@ msgstr "ææåççåéèèã"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1589
 #, c-format
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
 msgstr[0] "ææ %d åéé"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1780
@@ -2114,7 +2114,7 @@ msgid "Classification"
 msgstr "æé"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:769 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:492
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "æå"
@@ -2156,13 +2156,13 @@ msgid "Organizer"
 msgstr "æèåéä"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:767 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:491
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "çä"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:758 ../calendar/gui/e-cal-model.c:765
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
 #: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "åé"
@@ -2209,8 +2209,8 @@ msgid "is not"
 msgstr "äæ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "çèéé"
+msgid "Edit Reminder"
+msgstr "çèæé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2233,30 +2233,30 @@ msgid "Send an email"
 msgstr "åééåéä"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "æåéé"
+msgid "Add Reminder"
+msgstr "ååæé"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "éé"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "èèèæ(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "èèééèé"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
+msgid "Custom reminder sound"
+msgstr "èèæéèé"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Mes_sage:"
 msgstr "èæ(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "éé"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+msgid "Reminder"
+msgstr "æé"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "éè"
@@ -2278,8 +2278,8 @@ msgid "_Program:"
 msgstr "åèçå(_P):"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
-msgstr "éèéé(_R)"
+msgid "_Repeat the reminder"
+msgstr "éèéåæé(_R)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
@@ -2301,7 +2301,7 @@ msgstr "å"
 msgid "end of appointment"
 msgstr "çæçæ"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "æéééæ"
@@ -2327,10 +2327,10 @@ msgid "A_dd"
 msgstr "åå(_A)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "éé"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+msgid "Reminders"
+msgstr "æé"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
@@ -2369,15 +2369,16 @@ msgstr "éè(_R):"
 #: ../calendar/gui/dialogs/calendar-setup.c:417
 #: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
 #: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2960
+#: ../plugins/itip-formatter/itip-formatter.c:2974
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "äè"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:407
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "åäæå"
 
@@ -2385,27 +2386,27 @@ msgstr "åäæå"
 msgid "Memo List"
 msgstr "ååéæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "iCalendar éè"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:503
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "æèäæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "åäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:559
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
 msgstr "æååäæå"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "ååéæååæ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:615
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
 msgstr "æåååéæå"
 
@@ -2508,21 +2509,21 @@ msgid "Close the current window"
 msgstr "ééçåçèç"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1302
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1085 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1296
 msgid "Cut the selection"
 msgstr "åäéåçå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1092
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "åééåçå"
@@ -2532,9 +2533,9 @@ msgid "View help"
 msgstr "æèæå"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1308
 msgid "Paste the clipboard"
 msgstr "èäåèççåå"
 
@@ -2543,7 +2544,7 @@ msgid "Save current changes"
 msgstr "ååçåçèæ"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "éåæææå"
@@ -2556,19 +2557,19 @@ msgstr "æé(_C)"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ææ(_F)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1162
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -2582,7 +2583,7 @@ msgid "_Options"
 msgstr "éé(_O)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "æè(_V)"
 
@@ -2795,12 +2796,12 @@ msgid "Enter Delegate"
 msgstr "èåäè"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "éé(_A)"
+msgid "_Reminders"
+msgstr "æé(_R)"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Set or unset alarms for this event"
-msgstr "èåæåæéåääçéé"
+msgid "Set or unset reminders for this event"
+msgstr "èåæåæéåääçæé"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2844,12 +2845,12 @@ msgstr "çé/åç(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "æèæåæèççé/åçèè"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "çæ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "åæè"
@@ -2872,11 +2873,11 @@ msgstr "äèåæççèääïåçæäæåéä"
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
-msgstr "éåääåæéé"
+msgid "This event has reminders"
+msgstr "éåääåææé"
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "æèåéä(_G):"
@@ -2891,7 +2892,7 @@ msgstr "ççæææçää"
 
 #: ../calendar/gui/dialogs/event-page.c:1430
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "éåææéè"
 
@@ -2909,12 +2910,12 @@ msgstr "çææééè"
 
 #: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "éèäååéäã"
 
 #: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "æåéèäååæèã"
 
@@ -2939,7 +2940,7 @@ msgstr "çæéåèäæã%sãï%s"
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2939
 #: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "æææä %s çäçä"
@@ -2966,47 +2967,47 @@ msgstr[0] "çæå %d åé"
 msgid "Customize"
 msgstr "èè"
 
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "åæè(_N)â"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "èèéé:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+msgid "Custom Reminder:"
+msgstr "èèæéï"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ääæè"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "æå(_Z):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "éé(_A)"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "æè(_D):"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "äç(_L):"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+msgid "_Reminder"
+msgstr "æé(_R)"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "æè(_S):"
@@ -3015,19 +3016,19 @@ msgstr "æè(_S):"
 msgid "_Time:"
 msgstr "æå(_T):"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "çæå 1 å"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "çæå 1 åæ"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
@@ -3102,7 +3103,7 @@ msgstr "éæäå(_T)"
 msgid "September"
 msgstr "äæ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "ååé"
 
@@ -3128,8 +3129,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "çæåã%sãéåååéï%s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2563
-#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2652
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "æäè"
@@ -3151,8 +3152,8 @@ msgstr "æäè(_O):"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "çç(_G):"
+msgid "_List:"
+msgstr "æå(_L):"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3190,21 +3191,21 @@ msgstr "æäéåäåçäé"
 msgid "All Instances"
 msgstr "ææäé"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution çæçèéåéææçæã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "éææææçæ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
 msgstr "éææääççææåææéåæå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
 msgstr "ç"
 
@@ -3212,7 +3213,7 @@ msgstr "ç"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
 msgstr "ä"
 
@@ -3221,7 +3222,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
 msgstr "ä"
 
@@ -3229,7 +3230,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
 msgstr "ä"
 
@@ -3237,7 +3238,7 @@ msgstr "ä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
 msgstr "å"
 
@@ -3245,7 +3246,7 @@ msgstr "å"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
 msgstr "çä"
 
@@ -3253,13 +3254,13 @@ msgstr "çä"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
 msgstr "æå"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "åäææ"
 
@@ -3267,7 +3268,7 @@ msgstr "åäææ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "1æè10æ"
 
@@ -3275,7 +3276,7 @@ msgstr "1æè10æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "11æè20æ"
 
@@ -3283,73 +3284,73 @@ msgstr "11æè20æ"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "21æè31æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ææä"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "ææå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "æææ"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "åç"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "æ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2138
 msgid "Add exception"
 msgstr "ååäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2179
 msgid "Could not get a selection to modify."
 msgstr "çæååèçèçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2185
 msgid "Modify exception"
 msgstr "çèäå"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2229
 msgid "Could not get a selection to delete."
 msgstr "çæååèåéçéååã"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2363
 msgid "Date/Time"
 msgstr "ææ/æé"
 
@@ -3412,8 +3413,8 @@ msgid "year(s)"
 msgstr "å"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
-msgstr "åæçééèéåäääèéå"
+msgid "Send my reminders with this event"
+msgstr "åæçæéèéåäääèéå"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
 msgid "Notify new attendees _only"
@@ -3434,7 +3435,7 @@ msgstr "çé"
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
 #: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3447,7 +3448,7 @@ msgstr "ååæ"
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
+#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3271
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
 msgid "Completed"
 msgstr "ååæ"
@@ -3467,7 +3468,7 @@ msgstr "é"
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
 #: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/print.c:3268
 msgid "In Progress"
 msgstr "éèä"
 
@@ -3482,7 +3483,7 @@ msgstr "ä"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1528 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:515
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3494,7 +3495,7 @@ msgstr "äè"
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
 #: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "æéå"
 
@@ -3550,7 +3551,7 @@ msgstr "æéèæè/æèèåäççæèçèæ"
 msgid "_Send Options"
 msgstr "åééé(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "åä"
@@ -3584,11 +3585,11 @@ msgstr "äèåæççèåäïåçæäæåéä"
 msgid "Organi_zer:"
 msgstr "æèåéä(_Z):"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
 msgstr "åææéè"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
+#: ../calendar/gui/dialogs/task-page.c:1737
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "çæåã%sãéååäï%s"
@@ -3766,39 +3767,39 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ææ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "æ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1534
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "å"
 
-#: ../calendar/gui/e-cal-model.c:771 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2631
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../calendar/gui/e-cal-model.c:1530
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "éæææå"
 
-#: ../calendar/gui/e-cal-model.c:1532
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "åæå"
 
-#: ../calendar/gui/e-cal-model.c:2714
+#: ../calendar/gui/e-cal-model.c:2794
 #, c-format
 msgid "Opening %s"
 msgstr "æåéå %s"
@@ -3871,14 +3872,14 @@ msgstr "ææçä"
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2619
 msgid "Accepted"
 msgstr "æå"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2611
+#: ../plugins/itip-formatter/itip-formatter.c:2625
 msgid "Declined"
 msgstr "åæ"
 
@@ -3892,7 +3893,7 @@ msgstr "æè"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2614
+#: ../plugins/itip-formatter/itip-formatter.c:2628
 msgid "Delegated"
 msgstr "ååæ"
 
@@ -3919,7 +3920,7 @@ msgid "Organizer: %s"
 msgstr "æèåéä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "äçï%s"
@@ -3964,7 +3965,7 @@ msgstr "éççäæå"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
 #: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
@@ -3997,7 +3998,7 @@ msgstr "%mæ%dæ%A"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1015
+#: ../modules/calendar/e-cal-shell-view-private.c:1045
 msgid "%a %d %b"
 msgstr "%mæ%dæ (%a)"
 
@@ -4009,7 +4010,7 @@ msgstr "%mæ%dæ (%a)"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1051
+#: ../modules/calendar/e-cal-shell-view-private.c:1081
 msgid "%d %b"
 msgstr "%mæ%dæ"
 
@@ -4343,8 +4344,8 @@ msgid "%d %B"
 msgstr "%mæ%dæ"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "ååæééã"
+msgid "It has reminders."
+msgstr "ååææéã"
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4439,16 +4440,16 @@ msgid "Gnome Calendar"
 msgstr "Gnome èäæ"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1011
+#: ../modules/calendar/e-cal-shell-view-private.c:1041
 msgid "%A %d %b %Y"
 msgstr "%Yå%mæ%dæ (%A)"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1018
-#: ../modules/calendar/e-cal-shell-view-private.c:1024
-#: ../modules/calendar/e-cal-shell-view-private.c:1027
+#: ../modules/calendar/e-cal-shell-view-private.c:1048
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
 msgid "%a %d %b %Y"
 msgstr "%Yå%mæ%dæ (%a)"
 
@@ -4456,10 +4457,10 @@ msgstr "%Yå%mæ%dæ (%a)"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1044
-#: ../modules/calendar/e-cal-shell-view-private.c:1055
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1074
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1092
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
 msgid "%d %b %Y"
 msgstr "%Yå%mæ%dæ"
 
@@ -4489,7 +4490,7 @@ msgstr "çææçèäææè"
 msgid "calendar view for one or more weeks"
 msgstr "çæäæåéçèäææè"
 
-#: ../calendar/gui/gnome-cal.c:2209
+#: ../calendar/gui/gnome-cal.c:2219
 msgid "Purging"
 msgstr "æé"
 
@@ -4769,71 +4770,71 @@ msgstr "å"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
 msgstr " å "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
 msgstr " (ååæ) "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
 msgstr "ååæ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
 msgstr "(æé)"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
 msgstr "æé "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "æèï%s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "åæè:"
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "çæ(_S): %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "ååéå(_P): %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "åæçåæ: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "çå: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "åé: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "éçä: "
 
@@ -4864,7 +4865,7 @@ msgstr "çæåæè"
 
 #: ../calendar/importers/icalendar-importer.c:411
 #: ../calendar/importers/icalendar-importer.c:821
-#: ../plugins/itip-formatter/itip-formatter.c:2094
+#: ../plugins/itip-formatter/itip-formatter.c:2108
 msgid "Opening calendar"
 msgstr "éåèäæ"
 
@@ -4932,8 +4933,8 @@ msgstr "æäååé"
 
 #: ../calendar/importers/icalendar-importer.c:1098
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "åæéé"
+msgid "has reminders"
+msgstr "åææé"
 
 #: ../calendar/importers/icalendar-importer.c:1103
 msgctxt "iCalImp"
@@ -6611,7 +6612,7 @@ msgstr "æåæéä(_M)"
 msgid "Open New Message window"
 msgstr "éåæçéäèç"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "èå Evolution"
 
@@ -6831,11 +6832,11 @@ msgstr "çæååéåçéäïææèåååæè(æåè)"
 msgid "Compose Message"
 msgstr "çèéä"
 
-#: ../composer/e-msg-composer.c:4155
+#: ../composer/e-msg-composer.c:4203
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "éäçèåååäèçèçéæåçéäåæã"
 
-#: ../composer/e-msg-composer.c:4860
+#: ../composer/e-msg-composer.c:4908
 msgid "Untitled Message"
 msgstr "æååçéä"
 
@@ -6936,7 +6937,7 @@ msgstr "ååéäååäåã"
 msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "ææã{0}ãäæäèææèäçæåéääåéã"
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "ååçéèç &quot;{0}&quot;ã"
 
@@ -7113,7 +7114,7 @@ msgid ""
 msgstr "åæååèäéçåäæåååéäåææäéçæéã"
 
 #: ../capplet/settings/mail-account-view.c:633
-#: ../mail/em-account-editor.c:2182 ../mail/em-account-editor.c:2315
+#: ../mail/em-account-editor.c:2196 ../mail/em-account-editor.c:2329
 msgid "Identity"
 msgstr "èå"
 
@@ -7165,7 +7166,7 @@ msgid "Back - Receiving options"
 msgstr "ääæ - ææéé"
 
 #: ../capplet/settings/mail-account-view.c:638
-#: ../mail/em-account-editor.c:3202
+#: ../mail/em-account-editor.c:3306
 msgid "Defaults"
 msgstr "éèå"
 
@@ -7292,7 +7293,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution éäèèäæ"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Groupware åèèé"
 
@@ -7562,7 +7563,7 @@ msgstr "èèåå?"
 msgid "File exists \"{0}\"."
 msgstr "ææåååã{0}ãã"
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "èå(_O)"
 
@@ -7595,14 +7596,14 @@ msgid "Reply-To"
 msgstr "åè"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2564 ../mail/em-format-html.c:2632
-#: ../mail/em-format-html.c:2655 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "åæ"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2565 ../mail/em-format-html.c:2636
-#: ../mail/em-format-html.c:2658 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "åäåæ"
 
@@ -7614,7 +7615,7 @@ msgid "Subject"
 msgstr "äæ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2757
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
 #: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "åäè"
@@ -7831,8 +7832,8 @@ msgid "No reply or parent"
 msgstr "ææååæååéä"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
-msgstr "åæéäçç(_N)"
+msgid "I_nclude threads:"
+msgstr "åæéäçç(_N):"
 
 #: ../filter/e-filter-rule.c:784
 msgid "A_dd Condition"
@@ -7875,7 +7876,7 @@ msgstr "çåææã"
 msgid "Missing file name."
 msgstr "çåææåçã"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "çååçã"
 
@@ -8015,11 +8016,11 @@ msgctxt "mail-receiving"
 msgid "None"
 msgstr "ææ"
 
-#: ../mail/em-account-editor.c:2179
+#: ../mail/em-account-editor.c:2193
 msgid "Mail Configuration"
 msgstr "éäçæ"
 
-#: ../mail/em-account-editor.c:2180
+#: ../mail/em-account-editor.c:2194
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8029,7 +8030,7 @@ msgstr ""
 "\n"
 "æääãççãéåã "
 
-#: ../mail/em-account-editor.c:2183
+#: ../mail/em-account-editor.c:2197
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -8038,19 +8039,19 @@ msgstr ""
 "èåäéèåæçåçåééååããéææãçæäääåèåïééæåæåéå"
 "çéäåååéäèèã"
 
-#: ../mail/em-account-editor.c:2185 ../mail/em-account-editor.c:2374
+#: ../mail/em-account-editor.c:2199 ../mail/em-account-editor.c:2388
 msgid "Receiving Email"
 msgstr "ææéåéä"
 
-#: ../mail/em-account-editor.c:2186
+#: ../mail/em-account-editor.c:2200
 msgid "Please configure the following account settings."
 msgstr "èåèåäååèçèååã"
 
-#: ../mail/em-account-editor.c:2188 ../mail/em-account-editor.c:2898
+#: ../mail/em-account-editor.c:2202 ../mail/em-account-editor.c:3000
 msgid "Sending Email"
 msgstr "åééåéä"
 
-#: ../mail/em-account-editor.c:2189
+#: ../mail/em-account-editor.c:2203
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8058,11 +8059,11 @@ msgstr ""
 "èèåääéæåééäæåçèèãåææäææïèèçççççåæçèæåä"
 "æåã"
 
-#: ../mail/em-account-editor.c:2191 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2205 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "åèèè"
 
-#: ../mail/em-account-editor.c:2192
+#: ../mail/em-account-editor.c:2206
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8070,11 +8071,11 @@ msgstr ""
 "èåäéççéèåæèéååèçåçã\n"
 "éååçåååçéçäçã"
 
-#: ../mail/em-account-editor.c:2196
+#: ../mail/em-account-editor.c:2210
 msgid "Done"
 msgstr "åæ"
 
-#: ../mail/em-account-editor.c:2197
+#: ../mail/em-account-editor.c:2211
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8088,34 +8089,30 @@ msgstr ""
 "\n"
 "èæääãåçãååèåã"
 
-#: ../mail/em-account-editor.c:2696
+#: ../mail/em-account-editor.c:2729
 msgid "Check for _new messages every"
 msgstr "èåæææéäæ(_N)"
 
-#: ../mail/em-account-editor.c:2704
+#: ../mail/em-account-editor.c:2737
 msgid "minu_tes"
 msgstr "åé(_T)"
 
-#: ../mail/em-account-editor.c:3015
-msgid "Please select a folder from the current account."
-msgstr "èéæçååèçèæåã"
-
-#: ../mail/em-account-editor.c:3341 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3445 ../mail/mail-config.ui.h:101
 msgid "Security"
 msgstr "ååæ"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3395 ../mail/em-account-editor.c:3478
+#: ../mail/em-account-editor.c:3499 ../mail/em-account-editor.c:3582
 msgid "Receiving Options"
 msgstr "ææéé"
 
-#: ../mail/em-account-editor.c:3396 ../mail/em-account-editor.c:3479
+#: ../mail/em-account-editor.c:3500 ../mail/em-account-editor.c:3583
 msgid "Checking for New Messages"
 msgstr "æææéä"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1217 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1381 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8132,9 +8129,9 @@ msgstr "åçæè"
 msgid "List View"
 msgstr "æåæè"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ééæèç"
 
@@ -8209,7 +8206,7 @@ msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "åå %d åéä"
 
-#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:577
+#: ../mail/e-mail-folder-utils.c:1519 ../mail/em-folder-utils.c:583
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "çæçèæå URIã%sã"
@@ -8279,28 +8276,28 @@ msgstr "åç"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
 #: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "æäå"
 
 #: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "èç"
 
 #: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "åäå"
 
 #: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "ååé"
 
 #: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8344,578 +8341,578 @@ msgstr "çæåã%sãåçæåéäèæåï%s"
 msgid "Please select a folder"
 msgstr "èéæèæå"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "èèèèæå"
 
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:481
 msgid "C_opy"
 msgstr "èè(_O)"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "çèèæå"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:481
 msgid "_Move"
 msgstr "çå(_M)"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "äèåèåæ(_D)ã"
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "æéåçéäèåçåèæä(_A)"
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "åååäèåçéæå(_D)"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "æååäèèéèé"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
 msgstr "ææååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
 msgstr "çéæéääçååéäçæ"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "èèèèæå(_C)â"
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
 msgstr "èèåéåçéäååäåèæå"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "åééä(_D)"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "åéåçéäæçæèåé"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "éäèåéæå(_L)â"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "çéåéäèååçéæåèå"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "æäèéæå(_R)â"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
 msgstr "çéäæäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "åäèéæå(_N)â"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
 msgstr "çéååäèåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "äæéæå(_S)â"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
 msgstr "çéåäæåçéæåèå"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "åçéæå(_P)"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
 msgstr "åçéæåèåææéåçéä"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "åéäååæ(_F)â"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
 msgstr "æåéççéäææäçæå"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "æéæå(_C)"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "çééåéäçèéææ"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "æèçååæ(_F)"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "ååéåéäçèéææèçååæ"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "èé(_U)â"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
 msgstr "åéåçéäåäèéææ"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "éä(_A)"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "åéåçéääéäååèåçæä"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "äéäèå(_A)"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "èå(_I)"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "åéèèåçéäåéææéäçåæä"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
 msgstr "äèåèå(_I)"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "åæ(_Q)"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "åéèèåçéääåèéäæååå"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "äåæèå(_Q)"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "èååç(_L)"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "éè HTML æåçéäæåèèååç"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "éè(_I)"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "åéåçéäæçæéè"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "ååéä(_J)"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "åéåçéäæçæååéä"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "äæååéä(_N)"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "åéåçéäæçæäæååéä"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "åéè(_R)"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
 msgstr "åéåçéäæçæåçéè"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "äéè(_M)"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "åéåçéäæçæäéè"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "æéè(_U)"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "åéåçéäæçææéè"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "çèçæéä(_E)â"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "åæåèçéåéåçéäääçè"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "æåæéä(_N)"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
 msgstr "éåèçääæåéä"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "åæèçéå(_O)"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
 msgstr "äçæèçéåéåçéä"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "çèèæå(_M)â"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
 msgstr "åéåçéäçèåäåèæå"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "åæèèæå(_S)"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
 msgstr "éçäåèæå"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
 msgstr "åæèääååé(_N)"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
 msgstr "åæèääååé(_P)"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
 msgstr "åæèääååé"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
 msgstr "ééçåçåé(_O)"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
 msgstr "ééçåçåé"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "ääåéä(_N)"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "ääåéèéä(_I)"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "ääåçééä(_T)"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "ääåæéèçéä(_U)"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "ääåéä(_P)"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
 msgstr "éçääåéä"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ääåéèéä(_E)"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
 msgstr "éçääåéèçéä"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "ääåçééä(_H)"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
 msgstr "éçääåçééä"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "ääåæéèçéä(_R)"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
 msgstr "éçääåæéèçéä"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "ååéä"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
 msgstr "éèéèååçéä"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "éæåå(_D)"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "åéåçéäéæååçæä"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
 msgstr "çééä(_V)"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
 msgstr "çééä"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
 msgstr "çééèçéä(_P)"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
 msgstr "ææéåçéäæåæéè"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
 #: ../modules/calendar/e-cal-shell-view-actions.c:1477
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "åèææä(_A)"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "æååéçåéåéäçåéæäè"
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "åèèæå(_L)"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "æååéçæéåéäçéäèå"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "åèåäè(_R)"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
 msgstr "æååéçæéåçéäçåäè"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
 msgstr "ååæ mbox(_S)â"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
 msgstr "åéåçéäååæ mbox ææ"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "éääæ(_M)"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
 msgstr "éçéäååæ"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "åååééä(_U)"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
 msgstr "åæåééåçéä"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
 msgstr "éèæåçåååå"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "æè(_Z)"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
 msgstr "åæåæå"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "æé(_O)"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
 msgstr "åæåçå"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "åçèå(_U)"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "ååçç(_A)"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "èåç(_O)"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
 msgstr "ççåè(_G)"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "çè(_G)"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "æçæ(_K)"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "éä(_M)"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
 msgstr "éäèåæåèæå(_L)â"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
 msgstr "çéåéäèååçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
 msgstr "åæäèæåèæå(_T)â"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
 msgstr "çéäæäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
 msgstr "åäèæåèæå(_D)â"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
 msgstr "çéååäèåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
 msgstr "äææåèæå(_U)â"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
 msgstr "çéåäæåçäåæåèæå"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "æççèé(_W)â"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "æçæéè(_I)"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "æçæååéä(_J)"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "æçæéååéä(_N)"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "æçæåéè(_K)"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "æçæäéè(_M)"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "æçææéè(_U)"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "æåæå(_C)"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "åéççéäåæäéçéçææ"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "ææéäæé(_H)"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
 msgstr "éçéäåèçæé"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "æåååéäã%sã"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3237 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:306
 #: ../plugins/google-account-setup/google-source.c:549
 #: ../plugins/google-account-setup/google-source.c:688
@@ -8923,44 +8920,44 @@ msgstr "æåååéäã%sã"
 msgid "Default"
 msgstr "éèå"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3404
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "èå(_F)"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3405
 msgid "Forward the selected message to someone"
 msgstr "åéåçéäèåçæä"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3424
 msgid "Group Reply"
 msgstr "ççåè"
 
-#: ../mail/e-mail-reader.c:3417
+#: ../mail/e-mail-reader.c:3425
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "åèçéäèåïææçææçæäè"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3478 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "åé"
 
-#: ../mail/e-mail-reader.c:3503
+#: ../mail/e-mail-reader.c:3511
 #: ../modules/calendar/e-cal-shell-view-actions.c:1323
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3507
+#: ../mail/e-mail-reader.c:3515
 #: ../modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ääå"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3524 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "åè"
 
-#: ../mail/e-mail-reader.c:4186
+#: ../mail/e-mail-reader.c:4194
 #, c-format
 msgid "Folder '%s'"
 msgstr "èæåã%sã"
@@ -8981,7 +8978,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "èæåã%sãåå %u åéèçéäãæçåèåéåï"
 
-#: ../mail/e-mail-reader-utils.c:960
+#: ../mail/e-mail-reader-utils.c:1034
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "ååéä"
@@ -8991,7 +8988,7 @@ msgstr[0] "ååéä"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:981
+#: ../mail/e-mail-reader-utils.c:1055
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "éä"
@@ -9116,11 +9113,11 @@ msgstr "éééçïã%sã"
 msgid "an unknown sender"
 msgstr "äæçåäè"
 
-#: ../mail/em-composer-utils.c:2937
+#: ../mail/em-composer-utils.c:2941
 msgid "Posting destination"
 msgstr "åèçççç"
 
-#: ../mail/em-composer-utils.c:2938
+#: ../mail/em-composer-utils.c:2942
 msgid "Choose folders to post the message to."
 msgstr "éåèæåäåèéäã"
 
@@ -9403,53 +9400,53 @@ msgstr "éåçé"
 msgid "Folder Properties"
 msgstr "èæååå"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<æéèéæèæå>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "èæååç(_N):"
 
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:661
 msgid "Folder names cannot contain '/'"
 msgstr "èæååçäèååæçã"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:781
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1603
 msgid "Mail Folder Tree"
 msgstr "éäèæåæ"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2082 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
 msgstr "æåçåèæå %s"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
 msgstr "æåèèèæå %s"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2092 ../mail/message-list.c:2218
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "æååéäçèèæå %s"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2096 ../mail/message-list.c:2220
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "æåèèéäèèæå %s"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2115
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "çæåéäææåæäåçååå"
@@ -9471,158 +9468,158 @@ msgstr "äçå"
 msgid "Loading..."
 msgstr "èåäâ"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:482
 msgid "Move Folder To"
 msgstr "çåèæåå"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:482
 msgid "Copy Folder To"
 msgstr "èèèæåå"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:562
 msgid "Create Folder"
 msgstr "åçèæå"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:563
 msgid "Specify where to create the folder:"
 msgstr "æåèåçèæåçäçï"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:166
 msgid "Formatting message"
 msgstr "æååéä"
 
-#: ../mail/em-format-html.c:368
+#: ../mail/em-format-html.c:378
 msgid "Formatting Message..."
 msgstr "æååéäâ"
 
-#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "æåååã%sã"
 
-#: ../mail/em-format-html.c:1697 ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "æçå"
 
-#: ../mail/em-format-html.c:1698 ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "ææççå"
 
-#: ../mail/em-format-html.c:1699 ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "çæççå"
 
-#: ../mail/em-format-html.c:1700 ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "çåææïäæçææéåäè"
 
-#: ../mail/em-format-html.c:1701 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "ççååïäéèåééé"
 
-#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "æåå"
 
-#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "åååïäåå"
 
-#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "ååå"
 
-#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "åååïåå"
 
-#: ../mail/em-format-html.c:2110
+#: ../mail/em-format-html.c:2120
 msgid "Unknown external-body part."
 msgstr "æççååææéåã"
 
-#: ../mail/em-format-html.c:2120
+#: ../mail/em-format-html.c:2130
 msgid "Malformed external-body part."
 msgstr "æåäèçååææéåã"
 
-#: ../mail/em-format-html.c:2151
+#: ../mail/em-format-html.c:2161
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP çæç (%s)"
 
-#: ../mail/em-format-html.c:2162
+#: ../mail/em-format-html.c:2172
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "æåçææ (%s) æ ã%sãææçæç"
 
-#: ../mail/em-format-html.c:2164
+#: ../mail/em-format-html.c:2174
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "æåæææç (%s)"
 
-#: ../mail/em-format-html.c:2185
+#: ../mail/em-format-html.c:2195
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "éçèææç (%s)"
 
-#: ../mail/em-format-html.c:2200
+#: ../mail/em-format-html.c:2210
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "äæçåéæææç (ã%sãéå)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2905
+#: ../mail/em-format-html.c:2915
 #: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "åäèï%s"
 
-#: ../mail/em-format-html.c:2927
+#: ../mail/em-format-html.c:2937
 msgid "(no subject)"
 msgstr "(ææäæ)"
 
-#: ../mail/em-format-html.c:3003
+#: ../mail/em-format-html.c:3013
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "éåéäæç %s äè %s åå"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "æéäæçåãääèæéäåéèã"
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "æéäåçåèäææïèçåéåæåèæéèçéäã"
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "éäççåçææéïåèåååéæèæåäã"
 
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "æéäæäåææççåïäæéäçåäèçææéã"
 
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "æéäæäåææççåïäæææåæçåéééã"
 
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "æéäæååãåçåååééçéçèåéåèæèæéã"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9631,13 +9628,13 @@ msgstr ""
 "æéäåååïäæäçäååçååæçæãåéçäåéæéååïäåèääæ"
 "æïääæçææèæéäçååã"
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "æéäåååãåéçäéäæèæéäçååã"
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9646,15 +9643,15 @@ msgstr ""
 "æéäåååïäçååçååæçæãçäçéäææéïåéçäåéæéæéä"
 "çååã"
 
-#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "æèæè(_V)"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
 msgstr "ææèçææè"
 
-#: ../mail/em-format-html-display.c:552
+#: ../mail/em-format-html-display.c:556
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9662,27 +9659,39 @@ msgstr ""
 "Evolution çæéçæåéåéäïåçååèåèèççååãæåäçäæççæ"
 "åæäçåéæåçèåäéèåã"
 
-#: ../mail/em-format-html-display.c:848
+#: ../mail/em-format-html-display.c:740
+msgid "Save Image"
+msgstr "åååç"
+
+#: ../mail/em-format-html-display.c:786
+msgid "Save _Image..."
+msgstr "åååç(_I)â"
+
+#: ../mail/em-format-html-display.c:788
+msgid "Save the image to a file"
+msgstr "ååçååçææ"
+
+#: ../mail/em-format-html-display.c:1010
 msgid "Completed on"
 msgstr "ååææ"
 
-#: ../mail/em-format-html-display.c:860
+#: ../mail/em-format-html-display.c:1022
 msgid "Overdue:"
 msgstr "åææ:"
 
-#: ../mail/em-format-html-display.c:868
+#: ../mail/em-format-html-display.c:1030
 msgid "by"
 msgstr "æ"
 
-#: ../mail/em-format-html-display.c:1142 ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1306 ../mail/em-format-html-display.c:1353
 msgid "View _Unformatted"
 msgstr "æéææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1144
+#: ../mail/em-format-html-display.c:1308
 msgid "Hide _Unformatted"
 msgstr "éèææçç(_U)"
 
-#: ../mail/em-format-html-display.c:1209
+#: ../mail/em-format-html-display.c:1373
 msgid "O_pen With"
 msgstr "äâéå(_O)"
 
@@ -9783,7 +9792,7 @@ msgstr "äè %s çéä"
 msgid "Search _Folders"
 msgstr "æåèæå(_F)"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "ååèæå"
 
@@ -9840,7 +9849,7 @@ msgid "Always request read receipt"
 msgstr "äåèæèäåæ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "éèèæåçæåäéççæé(ç)ã"
 
@@ -10332,7 +10341,7 @@ msgid "Layout style"
 msgstr "éçæå"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "æèéçéäççã"
 
@@ -10979,7 +10988,7 @@ msgid "Importing Elm data"
 msgstr "èå Elm èæ"
 
 #: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "éä"
@@ -10999,13 +11008,13 @@ msgstr "çççèæå(_D):"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "éæèæå"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "éåèæåäèå"
 
@@ -11035,8 +11044,7 @@ msgstr "æåååäç"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:629
 #, c-format
 msgid "Importing '%s'"
 msgstr "æåååã%sã"
@@ -11219,7 +11227,7 @@ msgid "Confirmations"
 msgstr "çè"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "ææ/æåæå"
@@ -12266,54 +12274,59 @@ msgid "Failed to open folder."
 msgstr "çæéåèæåã"
 
 #: ../mail/mail.error.xml.h:66
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr "çæåäæåæèææçéèæçææåã"
+
+#: ../mail/mail.error.xml.h:67
 msgid "Failed to remove attachments from messages."
 msgstr "çæçééääçéäã"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
 msgstr "çæååéäã"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
 msgstr "çæåéåçéäååèççã"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
 msgstr "çæåæèéèæåã"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "ææååäçæèåã"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "ææååääæäèææã"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "èæåã{0}ãäæååääéèçéäã"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "åææéæççïåçæååéäéäã"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "åææåéèæåïåçææååååèæåååææéåéã"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "åææéæåéèæåïåçææååææéæåã"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "åæççïææçäçäæååèææäåéã"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12321,33 +12334,33 @@ msgstr ""
 "åæççïèåèçèèäå\n"
 "åææçäçäæåææéåéã"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "åæççïåèèèææäåéã"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "åææéæçæïåæåå Evolution äåïäæåééäéäã"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "åç"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
 msgstr "çæçéè"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "åééäåæ"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "éäéæåèåææã"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -12358,7 +12371,7 @@ msgstr ""
 "äææéïææéåçéääææçæäèãèéåæææïæèèåæåäåãæä"
 "èïãæãåæïãæäèã"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -12367,35 +12380,35 @@ msgstr ""
 "åæåèæåäéççéäääæèæãåæåèæåäåééäåæèæçæåæé"
 "çèæååéåéçéäãæåçåèåééäéäï"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
 msgstr "éæèæåã"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
 msgstr "æä(_E)"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
 msgstr "æäåéèçéäã"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "æéåäæã"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
 msgstr "äæéåéåéäåèæèèèåæéã"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "èææåèèåäåèäæã"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
 msgstr "èåçèåèæäçåäåèåéã"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -12403,7 +12416,7 @@ msgstr ""
 "èåãæäèïãæäèåäåææçéåéäååãæåäæääèåæåæéç"
 "ãæäèïãæéïæåéåéäååã"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12412,63 +12425,63 @@ msgstr ""
 "èçåääæäèåæääåäææ HTML éåéäï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "èèååäèèéåçåæçççåçã"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "èçåã"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "èçèéäèæåã{0}ãççåéã"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "åäæåæèææçéèæçææåã"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
 msgstr "èæèäåæã"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "çåèåéèæåã{0}ãäååææçåèæå?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
 msgstr "çåèåéèæåã{0}ãï"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
 msgstr "æåçééèçéäï"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
 msgstr "çäåè(_P)"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "æåèæåèåææã"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
 msgstr "æååéçäåèï"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
 msgstr "æååèçææçæäèï"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "çåæåçåå"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "æååæèæåääéçäçï"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12476,7 +12489,7 @@ msgstr ""
 "Evolution éèççèæåæèæåäæïèäèèæåäåäéæååãçåæå"
 "éã"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12491,7 +12504,7 @@ msgstr ""
 "ææéïæåçéääææçæäèãèéåæææïææèèåæåäåãæä"
 "èïãæãåæïãæäèã "
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12499,7 +12512,7 @@ msgstr ""
 "äåæäèçæèèçææçéääåï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12507,15 +12520,15 @@ msgstr ""
 "äåæäèçæèèçææçéääåï\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "åäçææåéååèäåäåèã"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
 msgstr "éäéääæèæã"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12523,68 +12536,68 @@ msgstr ""
 "æèæååèåçèåæåã\n"
 "éèæïèçèæåèæåçèåïäæåæåæååã"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "åçæææåçéæçäåéçåèïæäçæåéæéäã"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "åçææææåääæäèïæäçæåéæéä"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "æäæåäæææéèéåèäææäææéèã"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "æççåçèæïäåæååã"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "éæåæçéåçèæååååèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
 msgstr "éæåæçéåçèæåäææéäçåéèã"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
 msgstr "çæéçè GroupWise äæåã"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "çæéåæåèçèçèæåãæåäçççèçèæåäæï"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
 msgstr "çæèåææææã"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
 msgstr "çæææéäã"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "äçéèå(_D)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
 msgstr "äçéèçèçèæåï"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
 msgstr "ææèéééäèçåï"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -12593,7 +12606,7 @@ msgstr ""
 "ææäçäåèäèéäèåçéäïäæéåéäèååèåæçåäååèåãæ"
 "çåèççåï"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -12602,37 +12615,37 @@ msgstr ""
 "ææååèäèéäèåçéäïäææäçäåèæååçååäèïèéååéä"
 "èåãæçåèççåï"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "ææååèçääæåéçèåæäèãæçååäçäååéï"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "æææèåçæéåéæåéäã"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "æææååææåéçèèã"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "æææååçéäïæçèåäéèééåï"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
 msgstr "æäèççåçåçåçåååèã"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
 msgstr "æåéååææåèæåã"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
 msgstr "æåéæåäåèæåã"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -12641,65 +12654,65 @@ msgstr ""
 "æåéèåæåäåèæåçæäæã\n"
 "ååéåèæåïçå/æéåæææåèæåãææéçèæåæäèçéã"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "æçåäæåã{0}ãçåèçã{0}ãïäåæäã"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
 msgstr "çæ(_A)"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
 msgstr "æå(_A)"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "åç(_D)"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
 msgstr "ææèæ(_D)"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:158
 #: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "_Empty Trash"
 msgstr "æçåæç(_E)"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
 msgstr "çæ _Evolution "
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "æé(_E)"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
 msgstr "çåèç(_M)"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
 msgstr "å(_N)"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "éåéä(_O)"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
 msgstr "åéåæ(_S)"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
 msgstr "åæå(_S)"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
 msgstr "æ(_Y)"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
 msgstr "{0}"
 
@@ -12939,11 +12952,11 @@ msgstr "æåæå"
 msgid "Downloading"
 msgstr "äèä"
 
-#: ../modules/addressbook/addressbook-config.c:1272
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "éèéåå"
 
-#: ../modules/addressbook/addressbook-config.c:1274
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "æéèé"
 
@@ -13040,16 +13053,16 @@ msgid "Whether to show the preview pane."
 msgstr "æåéçéèçæã"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:184
 #: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "èææ(_T):"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "èååæ"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "æééçèåèéçéçääå(_S)"
 
@@ -13540,6 +13553,10 @@ msgstr "30 åé"
 msgid "60 minutes"
 msgstr "60 åé"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "éé"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "èç"
@@ -13561,8 +13578,8 @@ msgid "Display"
 msgstr "éç"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
-msgstr "ååéçååäéçéé(_N)"
+msgid "Display reminders in _notification area only"
+msgstr "ååéçååäéçæé(_N)"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Hours"
@@ -13573,415 +13590,415 @@ msgid "Minutes"
 msgstr "åé"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "éæ(_U)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "äéæåææè(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "çäæå(_C):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
-msgstr "éæéééççèäæ"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+msgid "Select the calendars for reminder notification"
+msgstr "éææééççèäæ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "éçæéæçæ(_O)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "éçæé(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "ååäèäæäåéææäääæééç(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "éçéæ(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "äååæçåä(_A):"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "éå(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "ææ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "æé"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "æåæå:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "äçççæå(_Y)"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "äééåæ(_K):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 #: ../modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Work Week"
 msgstr "åäé"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "åäæ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 åæ (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 åæ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "çåééçæåçè(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "åææèåçåéæéç(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "äæéåæ(_D):"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "éä(_F)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "éèååæçåä(_H)"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "éä(_M)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "éæçåä(_O):"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "éå(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "åéåæçæèåéççæççææé(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "æééé(_T):"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "éä(_T)"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "éä(_W)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "åæåéåçåæ/çæäå"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "å"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ééçå"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "çåééçæåçè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "äååæçåäèæèåïäç \"#rrggbb\" æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "éæåäçèæèåïäç \"#rrggbb\" æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
 msgstr "çæåéåçåææé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
 msgstr "çæåéåçåææéåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
 msgstr "çæåéåçåææéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
-msgstr "åèééçèäæ"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+msgid "Calendars to run reminders for"
+msgstr "åèæéçèäæ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "åæååäçäçè Marcus Bains ççèå(ççèçäçéèå)ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "åææèäçäçè Marcus Bains ççèå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "åææèåçåéæéç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "æçæçè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "åéææåäæéåèçææåæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "éèççææé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "éèæéçåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "éèæéçæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
-msgstr "çäåæéééææççé"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+msgid "Directory for saving reminder audio files"
+msgstr "çäåææééææççé"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "çé/åçäæåçå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "çé/åççæçå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "éèååæçåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "éèåäåä"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "éèåäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "æåçæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "åäæçææåéïä 24 åææåï0 è 23ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "åäæéåæåéïä 24 åææåï0 è 23ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "åæçãtrueãïååäèçäéçååééèçæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "åæçãtrueãïååäèçäéçåäéèçæã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "åãæãåãåäéãæèäéçééïäåéèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
-msgstr "äæééæå"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+msgid "Last reminder time"
+msgstr "äææéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "æèåææèääçççäæåæåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "çæçé/åççåçäæå URL æåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains ç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains çèåâææè"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains çèåâæåå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr "åãday_second_zonesãæåäèèäçæèäçæåæççæååã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "èèäçæèäçæåæççæååã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "ååééçæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "ååééèçæäçïæåï"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "ååééèçæäçïåçï"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "åäæçæåéï0 å 59ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "åäæéååéï0 å 59ã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "ææèçæåçæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "ææèçåççæäç"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr "æåçææéåçåææéçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "æåéèæéçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "æåäæéèåäçåäæçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "éæçåäèå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 "æåçæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "æåçæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "æåçåçæååééèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "æåçæåæåäéèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "æåçåçæåäéèçæçäçã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "åççæçäçïåèäææåèææåèèäæäéã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "åççæçäçïåææèäçèçèææåèèäæãåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 "åççæçäçïçäåææèäæïåææåèèäæèåäæåäéïäåçèã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "äèèäæ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "äèååéæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "äèåäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
-msgstr "çäåçééèåèççåã"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+msgid "Programs that are allowed to be run by reminders."
+msgstr "çäåçæéèåèççåã"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "æèåææèääçççäæå"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
 msgid "Recurrent Events in Italic"
 msgstr "éææäääæééç"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
+msgid "Reminder programs"
+msgstr "æéçåéçå"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
-msgstr "ååéééææçé"
+msgid "Save directory for reminder audio"
+msgstr "ååæééææçé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
@@ -14008,8 +14025,8 @@ msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr "ååäèäæäåéææääéååäæééçã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
-msgstr "åéçåäéçééçé"
+msgid "Show display reminders in notification tray"
+msgstr "åéçåäéçæéçé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
@@ -14126,8 +14143,8 @@ msgid "Time divisions"
 msgstr "æéåé"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
-msgstr "äæééåèçæé(_T)"
+msgid "Time the last reminder ran, in time_t."
+msgstr "äææéåèçæé(_T)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Timezone"
@@ -14176,8 +14193,8 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "æéçéåïåæææ (0) åææå (6)ã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
-msgstr "æåäçéçåéçééã"
+msgid "Whether or not to use the notification tray for display reminders."
+msgstr "æåäçéçåéçæéã"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when deleting an appointment or task."
@@ -14293,8 +14310,8 @@ msgid "I_mport to Tasks"
 msgstr "ååèåä(_M)"
 
 #: ../modules/calendar/e-calendar-preferences.c:441
-msgid "Selected Calendars for Alarms"
-msgstr "éæééèäæ"
+msgid "Selected Calendars for Reminders"
+msgstr "éææéèäæ"
 
 #: ../modules/calendar/e-calendar-preferences.c:840
 msgid "Ti_me and date:"
@@ -14363,7 +14380,6 @@ msgid "Create a new calendar"
 msgstr "åçæèäæ"
 
 #: ../modules/calendar/e-cal-shell-backend.c:755
-#: ../plugins/itip-formatter/itip-formatter.c:2951
 msgid "Calendar and Tasks"
 msgstr "èäæèåä"
 
@@ -15060,11 +15076,11 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d éåä"
 
-#: ../modules/mail/em-account-prefs.c:218
+#: ../modules/mail/em-account-prefs.c:219
 msgid "Evolution Account Assistant"
 msgstr "Evolution åèåç"
 
-#: ../modules/mail/em-account-prefs.c:267
+#: ../modules/mail/em-account-prefs.c:268
 msgid "Account Editor"
 msgstr "åèçèå"
 
@@ -15109,7 +15125,7 @@ msgid "Network Preferences"
 msgstr "çèååèå"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "åçåè(_D)"
 
@@ -15400,72 +15416,72 @@ msgstr "çåçåè"
 msgid "Current Folder"
 msgstr "çåçèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:559
+#: ../modules/mail/e-mail-shell-view.c:563
 msgid "All Account Search"
 msgstr "ææçåèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:732
+#: ../modules/mail/e-mail-shell-view.c:736
 msgid "Account Search"
 msgstr "åèæå"
 
-#: ../modules/mail/e-mail-shell-view.c:943
+#: ../modules/mail/e-mail-shell-view.c:947
 msgid "Proxy _Logout"
 msgstr "çåäçäæå(_L)"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "åéæ %d åï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ååå"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d åèç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d åæåé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d åååé"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d åæèï"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "å %d å"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
 msgstr "åæç"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
 msgstr "åé/ææ"
 
@@ -15660,39 +15676,39 @@ msgstr "åäçæåååéäæèã"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "åäçæåååéäæè (ææ DNS)ã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:281
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "èéæææèååçèèï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "äè %sï"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:324
-#: ../modules/startup-wizard/evolution-startup-wizard.c:422
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
+#: ../modules/startup-wizard/evolution-startup-wizard.c:420
 msgid "Importing Files"
 msgstr "æåååææ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:400
+#: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:418
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "ååååæãèæãääæãççã"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:492
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "Evolution èååç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:498
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
 msgstr "æèäç"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:503
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -15704,7 +15720,7 @@ msgstr ""
 "\n"
 "èæääãääæãæéççã "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:608
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 msgid "Loading accounts..."
 msgstr "æåèååèâ"
 
@@ -16688,177 +16704,181 @@ msgstr "çæåääåäæåäæåééåä"
 msgid "Unable to find this memo in any memo list"
 msgstr "çæåääååéæåäæåééååé"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1026
+#: ../plugins/itip-formatter/itip-formatter.c:1040
 msgid "Opening the calendar. Please wait..."
 msgstr "æåéåèäæãèçåâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1029
+#: ../plugins/itip-formatter/itip-formatter.c:1043
 msgid "Searching for an existing version of this appointment"
 msgstr "åæéåçææåççæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1302
+#: ../plugins/itip-formatter/itip-formatter.c:1316
 msgid "Unable to parse item"
 msgstr "çæåæéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1391
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "çæåééçèèäæã%sãã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1417
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "åéèèäæ '%s' äèçåæå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1421
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "åéèèäæ '%s' äèçäçåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1412
+#: ../plugins/itip-formatter/itip-formatter.c:1426
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "åéèèäæ '%s' äèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1417
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "åéèèäæã%sãäèçååæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1525
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "æèåéäåçéäçä %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1518
+#: ../plugins/itip-formatter/itip-formatter.c:1532
 msgid "Sent a cancelation notice to the delegate"
 msgstr "åéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1520
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "çæåéåæéççäçä"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1631
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "çæäåæççæäååæèçæçæææï"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1660
+#: ../plugins/itip-formatter/itip-formatter.c:1674
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "çæææåæèã%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1678
 msgid "Attendee status updated"
 msgstr "åæèçæåææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1668
+#: ../plugins/itip-formatter/itip-formatter.c:1682
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "åæèçæäèææïåçéçåçäåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1690
+#: ../plugins/itip-formatter/itip-formatter.c:1704
 msgid "Meeting information sent"
 msgstr "æèèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1693
+#: ../plugins/itip-formatter/itip-formatter.c:1707
 msgid "Task information sent"
 msgstr "åäèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1710
 msgid "Memo information sent"
 msgstr "ååéèèåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1719
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "çæååæèèèïèæèääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1708
+#: ../plugins/itip-formatter/itip-formatter.c:1722
 msgid "Unable to send task information, the task does not exist"
 msgstr "çæåååäèèïèéåääåå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1711
+#: ../plugins/itip-formatter/itip-formatter.c:1725
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "çæååååéèèïèååéääåå"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1776
+#: ../plugins/itip-formatter/itip-formatter.c:1790
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1781
+#: ../plugins/itip-formatter/itip-formatter.c:1795
 msgid "Save Calendar"
 msgstr "ååèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1839
-#: ../plugins/itip-formatter/itip-formatter.c:1850
+#: ../plugins/itip-formatter/itip-formatter.c:1853
+#: ../plugins/itip-formatter/itip-formatter.c:1864
 msgid "The calendar attached is not valid"
 msgstr "éåçèäææçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1840
-#: ../plugins/itip-formatter/itip-formatter.c:1851
+#: ../plugins/itip-formatter/itip-formatter.c:1854
+#: ../plugins/itip-formatter/itip-formatter.c:1865
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "æéäååååæèäæååïäåèäæäéææç iCalendarã"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1891
-#: ../plugins/itip-formatter/itip-formatter.c:1919
-#: ../plugins/itip-formatter/itip-formatter.c:2028
+#: ../plugins/itip-formatter/itip-formatter.c:1905
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:2042
 msgid "The item in the calendar is not valid"
 msgstr "èäæäçéçæçæç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1892
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../plugins/itip-formatter/itip-formatter.c:2029
+#: ../plugins/itip-formatter/itip-formatter.c:1906
+#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:2043
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 "æéäçååæèäæååïäèååäæååääääãåäæçé/åçèè"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1947
 msgid "The calendar attached contains multiple items"
 msgstr "éåçèäæåååæååéç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1934
+#: ../plugins/itip-formatter/itip-formatter.c:1948
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "èèçéäåéçéçïæèåæææååååååäçèäæ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2592
+#: ../plugins/itip-formatter/itip-formatter.c:2606
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ææ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2622
 msgid "Tentatively Accepted"
 msgstr "æææå"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2726
+#: ../plugins/itip-formatter/itip-formatter.c:2740
 msgid "This meeting recurs"
 msgstr "éåæèçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2729
+#: ../plugins/itip-formatter/itip-formatter.c:2743
 msgid "This task recurs"
 msgstr "ééåäçéæèåç"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2732
+#: ../plugins/itip-formatter/itip-formatter.c:2746
 msgid "This memo recurs"
 msgstr "éåååéçéæèåç"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2965
+msgid "Meeting invitations"
+msgstr "æèéè"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2976
+#: ../plugins/itip-formatter/itip-formatter.c:2990
 msgid "_Delete message after acting"
 msgstr "åæååééä(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2986
-#: ../plugins/itip-formatter/itip-formatter.c:3019
+#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3033
 msgid "Conflict Search"
 msgstr "èççæå"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3015
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "éæèæåæèèççèäæ"
 
@@ -17845,35 +17865,31 @@ msgstr "Outlook PST åå"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook åäèæå (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "éä(_M)"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "ççåèæå:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "éèé(_A)"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "çæ(_P)"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "åä(_T)"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
 msgstr "æèéç(_J)"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
 msgstr "åå Outlook èæ"
 
@@ -18600,7 +18616,7 @@ msgstr "ååäçèäéçæ"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -18611,278 +18627,270 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Evolution çç"
 
-#: ../shell/e-shell-window-actions.c:921
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
 msgstr "åéçèå"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "åæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "çæåè Bug Buddyã"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "éç Evolution çéèè"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "ééèç(_C)"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "åå(_C)"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
 msgstr "éå Evolution äçèæå"
 
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "éååèåé(FAQ)çé"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "éååç(_F)"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
 msgstr "åèææèæçåç"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "åå(_M)â"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
 msgstr "åååäçåçèæ"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "éæèç(_W)"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
 msgstr "åçäåæçèçäéçéåæè"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
 msgstr "åççåé(_G)"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
 msgstr "ççåççåé"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
 msgstr "åéååèå(_Q)"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
 msgstr "éç Evolution çæåé"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
 msgstr "éééåçå"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "ééæå(_A)â"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
 msgstr "åææééçæå"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
 msgstr "æéçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "çèååçæåçæ(_E)â"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
 msgstr "ççæåååçæå"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "æéèäæèæåéå"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "çåæå(_F)"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
 msgstr "åèçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "ååæåçæ(_S)â"
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
 msgstr "ååçåçæååæ"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "åééèåå(_B)â"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
 msgstr "äç Bug Buddy éåéèååã"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "éçåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
 msgstr "è Evolution éåéçæå"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "çäåä(_W)"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
 msgstr "è Evolution éåäçæå"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "äå(_O)"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "æå(_N)"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "æå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "åæåè(_S)"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "èç(_O)"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
 msgstr "éçåéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
 msgstr "éçåéå"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "éçæé(_B)"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
 msgstr "éçåæçåæé"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
 msgstr "éççæå(_S)"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
 msgstr "éççæå"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "éçååå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
 msgstr "éçååå"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
 msgstr "åæåç(_I)"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
 msgstr "åéçèçæéçåç"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "åææå(_T)"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
 msgstr "åéçèçæéçæå"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
 msgstr "åçåæå(_A)"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
 msgstr "éçèçæéçåçåæå"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "åååéæ(_B)"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "äçæéåååèååéçèçæé"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "åçæèâ"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
 msgstr "åçæçèæè(_C)"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "ååèèæèâ"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
 msgstr "ååçåçèèæè"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "çåæè(_U)"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "èèæè"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
 msgstr "çåçæèæåæèèçæè"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
 msgstr "äæçååèæçééååèå"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "åæè %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
 msgstr "åèéäæååæ"
 
@@ -20444,49 +20452,49 @@ msgstr "åäçåéçååèæã"
 msgid "Click here to go to URL"
 msgstr "æéèäçè URL"
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "èèéçäå(_C)"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "èèéçååèè"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
 msgstr "åçèååéåéç(_O)"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
 msgstr "åçéçèåäéåæéç"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
 msgstr "èèéåéääå(_C)"
 
-#: ../widgets/misc/e-web-view.c:445
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
 msgstr "èèåç(_C)"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
 msgstr "èèåçååèè"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1314
 msgid "Select all text and images"
 msgstr "éææææåååç"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:978 ../widgets/misc/e-web-view.c:980
+#: ../widgets/misc/e-web-view.c:982
 #, c-format
 msgid "Click to call %s"
 msgstr "æääæèç %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:984
 msgid "Click to hide/unhide addresses"
 msgstr "æéèéè/èééèäå"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to open %s"
 msgstr "æäääéå %s"



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