[evolution] Update Persian translation



commit a607750c7c1bb883baa384e7991fdc78d9cd1120
Author: Danial Behzadi <dani behzi ubuntu com>
Date:   Tue Aug 31 10:07:33 2021 +0000

    Update Persian translation

 po/fa.po | 7342 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 4042 insertions(+), 3300 deletions(-)
---
diff --git a/po/fa.po b/po/fa.po
index 5c39c362e6..12407c6c57 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2020-02-22 19:07+0000\n"
-"PO-Revision-Date: 2020-02-24 03:02+0000\n"
+"POT-Creation-Date: 2021-08-05 08:54+0000\n"
+"PO-Revision-Date: 2021-08-25 18:15+0430\n"
 "Last-Translator: Danial Behzadi <dani behzi ubuntu com>\n"
 "Language-Team: Persian <>\n"
 "Language: fa\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.4.2\n"
 "X-DamnedLies-Scope: partial\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -568,22 +568,16 @@ msgid ""
 msgstr "موقعیت قاب افقی، بین تقویم ناوشگر تاریخ و فهرست تکالیف در نمای ماه، به نقطه."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#, fuzzy
-#| msgid "Primary Email"
 msgid "Primary calendar"
-msgstr "رایانامه اصلی"
+msgstr "تقویم اصلی"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
-#, fuzzy
-#| msgid "New memo list"
 msgid "Primary memo list"
-msgstr "فهرست یادداشت جدید"
+msgstr "فهرست یادداشت اصلی"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
-#, fuzzy
-#| msgid "New task list"
 msgid "Primary task list"
-msgstr "فهرست تکلیف جدید"
+msgstr "فهرست تکلیف اصلی"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
@@ -635,6 +629,12 @@ msgstr "این که فیلد مقولات در ویرایشگر رویداد/ج
 msgid "Show the task preview pane"
 msgstr "نشان دادن قاب «پیش‌نمایش»"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#, fuzzy
+#| msgid "Whether to show categories field in the event/meeting editor"
+msgid "If “true”, show the task preview pane in the main window"
+msgstr "این که فیلد مقولات در ویرایشگر رویداد/جلسه نشان داده شود یا نه"
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 #, fuzzy
 #| msgid "Show week numbers in date navigator"
@@ -656,15 +656,28 @@ msgstr "موقعیت قاب عمودی"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #, fuzzy
+#| msgid "Whether to hide cancelled events in the calendar view"
+msgid "Show Tasks and Memos pane in the Calendar view"
+msgstr "این که رویدادهای لغو شده در نمای تقویم پنهان شوند یا خیر"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#, fuzzy
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show Tasks and Memos pane in the Calendar view"
+msgstr ""
+"این که وقت به جای استفاده از صبح/عصر در قالب بیست و چهار ساعتی نشان داده شود یا نه"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#, fuzzy
 #| msgid "Color for tasks due today"
 msgid "Highlight tasks due today"
 msgstr "رنگ تکلیف‌هایی که موعدشان امروز سر می‌رسد"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Tasks due today color"
 msgstr "رنگ تکلیف‌هایی که موعدشان امروز سر می‌رسد"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 #, fuzzy
 #| msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgid ""
@@ -672,41 +685,39 @@ msgid ""
 "with task-due-today-highlight"
 msgstr "رنگ پس‌زمینهٔ تکلیف‌هایی که موعدشان امروز سر می‌رسد، در قالب «#rrggbb».‏"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #, fuzzy
 #| msgid "Tasks vertical pane position"
 msgid "Task preview pane position (horizontal)"
 msgstr "موقعیت قاب عمودی تکلیف‌ها"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
-#, fuzzy
-#| msgid "Memo layout style"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task layout style"
-msgstr "_سبک چینش یادداشت"
+msgstr "سبک چینش وظیفه"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 #, fuzzy
 #| msgid "Tasks vertical pane position"
 msgid "Task preview pane position (vertical)"
 msgstr "موقعیت قاب عمودی تکلیف‌ها"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #, fuzzy
 #| msgid "Position of the horizontal pane in the month view"
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "موقعیت قاب افقی در نمای ماه"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 #, fuzzy
 #| msgid "Color for overdue tasks"
 msgid "Highlight overdue tasks"
 msgstr "رنگ تکلیف‌های عقب‌ افتاده"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "رنگ تکلیف‌های عقب افتاده"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 #, fuzzy
 #| msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgid ""
@@ -714,21 +725,21 @@ msgid ""
 "with task-overdue-highlight."
 msgstr "رنگ پس‌زمینهٔ تکلیف‌های عقب افتاده، در قالب «#rrggbb»."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "تقسیمات زمانی"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 #, fuzzy
 #| msgid "Intervals shown in Day and Work Week views, in minutes."
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "تقسیات زمانی بازه‌های نشان داده شده در نماهای روز و هفتهٔ کاری، به دقیقه."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "منطقهٔ زمانی"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 #, fuzzy
 #| msgid ""
 #| "The default timezone to use for dates and times in the calendar, as an "
@@ -740,76 +751,76 @@ msgstr ""
 "منطقهٔ زمانی پیش‌گزیده که برای تاریخ و زمان در تقویم استفاده شود، به صورت مکان "
 "استاندارد ترجمه نشده در پایگاه‌دادهٔ مناطق زمانی اولسن مثل «America/New York»."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "قالب زمانی بیست و چهار ساعته"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 #, fuzzy
 #| msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 "این که وقت به جای استفاده از صبح/عصر در قالب بیست و چهار ساعتی نشان داده شود یا نه"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 #, fuzzy
 #| msgid "Birthdays & Anniversaries"
 msgid "Birthday and anniversary reminder"
 msgstr "روزهای تولد و سالگردها"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 #, fuzzy
 #| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "این که برای قرارها یک یادآور پیش‌گزیده تنظیم شود یا نه."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "یادآور قرار پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 #, fuzzy
 #| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a default reminder for appointments"
 msgstr "این که برای قرارها یک یادآور پیش‌گزیده تنظیم شود یا نه."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "استفاده از منطقهٔ زمانی سامانه"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "دوشنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "سه‌شنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "چهارشنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "پنج‌شنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "آدینه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "شنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "یک‌شنبه یک روز کاری است"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "روز شروع هفته، از یکشنبه(۰) تا شنبه(۶)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
 msgid "(Deprecated) Work days"
 msgstr "روزهای کاری"
 
@@ -955,12 +966,28 @@ msgstr "تعداد زبان‌های بررسی املایی به‌تازگی 
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "انتخاب همهٔ متن پیام"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid ""
+"Show the “Bcc” field when sending a mail message. This is controlled from the View "
+"menu when a mail account is chosen."
+msgstr "انتخاب همهٔ متن پیام"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "Show “Cc” field when sending a mail message"
 msgstr "انتخاب همهٔ متن پیام"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid ""
+"Show the “Cc” field when sending a mail message. This is controlled from the View "
+"menu when a mail account is chosen."
+msgstr "انتخاب همهٔ متن پیام"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 #, fuzzy
 #| msgid "Select all the text in a message"
@@ -981,18 +1008,42 @@ msgstr "انتخاب همهٔ متن پیام"
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "انتخاب همهٔ متن پیام"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid ""
+"Show the “Reply To” field when sending a mail message. This is controlled from the "
+"View menu when a mail account is chosen."
+msgstr "انتخاب همهٔ متن پیام"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "انتخاب همهٔ متن پیام"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid ""
+"Show the “From” field when posting to a newsgroup. This is controlled from the "
+"View menu when a news account is chosen."
+msgstr "انتخاب همهٔ متن پیام"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "انتخاب همهٔ متن پیام"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#, fuzzy
+#| msgid "Select all the text in a message"
+msgid ""
+"Show the “Reply To” field when posting to a newsgroup. This is controlled from the "
+"View menu when a news account is chosen."
+msgstr "انتخاب همهٔ متن پیام"
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 #, fuzzy
 #| msgid "Do not quote original message"
@@ -1009,6 +1060,12 @@ msgstr "در حال ذخیرهٔ پیام‌ها در صندوق خروجی"
 msgid "Do not add signature delimiter"
 msgstr "نیفزودن جداگر امضا"
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#, fuzzy
+#| msgid "Use Unicode characters for emoticons."
+msgid "Number of characters for wrapping"
+msgstr "استفاده از نویسه‌های یونی‌کد برای شکلک‌ها."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 #, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
@@ -1021,358 +1078,376 @@ msgstr "این که فیلد مقولات در ویرایشگر رویداد/ج
 msgid "Wrap quoted text in replies"
 msgstr "_پیچش متن نقل‌شده در پاسخ‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#, fuzzy
+#| msgid "Plaintext Password"
+msgid "Paste plain text as preformatted"
+msgstr "گذرواژه‌ی متنی ساده"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 #, fuzzy
 #| msgid "Mar_k All Messages as Read"
 msgid "Mark replied to messages as read"
 msgstr "_علامت‌گذاری همهٔ پیام‌ها به عنوان خوانده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 #, fuzzy
 #| msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgid "Can be either “mbox” or “pdf”."
 msgstr "نمی‌توان شاخهٔ «{0}» را به «{1}» جابه‌جا کرد."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 #, fuzzy
 #| msgid "_Show image animations"
 msgid "Show image animations"
 msgstr "_نمایش پویانمایی‌ها تصویری"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 #, fuzzy
 #| msgid "Enable and disable plugins"
 msgid "Enable or disable type ahead search feature"
 msgstr "به کار انداختن و از کار انداختن متصل شونده‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 #, fuzzy
 #| msgid "Enable and disable plugins"
 msgid "Enable or disable magic space bar"
 msgstr "به کار انداختن و از کار انداختن متصل شونده‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 #, fuzzy
 #| msgid "Mark citations in the message \"Preview\""
 msgid "Mark citations in the message “Preview”"
 msgstr "علامت‌گذاری نقل قول‌ها در پیام «پیش‌نمایش»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Mark citations in the message “Preview”."
 msgstr "علامت‌گذاری نقل قول‌ها در پیام «پیش‌نمایش»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Citation highlight color"
 msgstr "رنگ پررنگ کردن نقل‌قول"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Citation highlight color."
 msgstr "رنگ پررنگ کردن نقل‌قول."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable/disable caret mode"
 msgstr "به‌کار انداخنم/از کار انداختن حالت مکان‌نمایی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "به کار انداختن حالت مکان‌نمایی، تا هنگامخواندن نامه‌ها مکان‌نما را ببینید."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Default charset in which to display messages"
 msgstr "مجموعه‌‌نویسهٔ پیش‌گزیده برای نمایش پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Default charset in which to display messages."
 msgstr "مجموعه‌‌نویسهٔ پیش‌گزیده برای نمایش پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 #, fuzzy
 #| msgid "Load images for HTML messages over http"
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "بار کردن تصاویر برای پیام‌های HTML از http"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 #, fuzzy
 #| msgid "Show the raw email source of the message"
 msgid "Show notification about missing remote content"
 msgstr "نشان دادن مبدأ خام رایانامهی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Show Animations"
 msgstr "نمایش پویانمایی‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Show animated images as animations."
 msgstr "نمایش تصاویر پویانمایی شده به صورت پویانمایی."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 #, fuzzy
 #| msgid "Collapse all message threads"
 msgid "Show all message headers"
 msgstr "جمع کردن همهٔ رشته‌های پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "Show all the headers when viewing a messages."
 msgstr "انتخاب همهٔ متن پیام"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "List of headers to show when viewing a message."
 msgstr "انتخاب همهٔ متن پیام"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 #, fuzzy
 #| msgid "Show the \"Preview\" pane"
 msgid "Show photo of the sender"
 msgstr "نشان دادن قاب «پیش‌نمایش»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 #, fuzzy
 #| msgid "Show the raw email source of the message"
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "نشان دادن مبدأ خام رایانامهی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 #, fuzzy
 #| msgid "Show the \"Preview\" pane"
-msgid "Search gravatar.com for photo of the sender"
+msgid "Search libravatar.org for photo of the sender"
 msgstr "نشان دادن قاب «پیش‌نمایش»"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Allow searching also at libravatar.org for photo of the sender."
+msgstr "نشان دادن قاب «پیش‌نمایش»"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Mark as Seen after specified timeout"
 msgstr "علامت‌گذاری به عنوان دیده پس از انقضای مدت مشخص"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Mark as Seen after specified timeout."
 msgstr "علامت‌گذاری به عنوان دیده پس از انقضای مدت مشخص."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 #, fuzzy
 #| msgid "Mark as Seen after specified timeout"
 msgid "Mark as Seen always after specified timeout"
 msgstr "علامت‌گذاری به عنوان دیده پس از انقضای مدت مشخص"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 #, fuzzy
 #| msgid "Timeout for marking message as Seen"
 msgid "Timeout for marking messages as seen"
 msgstr "مدت لازم برای علامت‌گذاری پیام به دیده شده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 #, fuzzy
 #| msgid "Timeout for marking message as Seen."
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "مدت لازم برای علامت‌گذاری پیام به دیده شده."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Show Attachment Bar"
 msgstr "نمایش نوار پیوست"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr "نمایش نوار پیوست در زیر قاب پیش‌نمایش پیام هنگامی که پیام، پیوست دارد."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 #, fuzzy
 #| msgid "Remove an email address from the List"
 msgid "Sender email-address column in the message list"
 msgstr "حذف یک نشانی رایانامه از فهرست"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid ""
 "Show the email-address of the sender in a separate column in the message list."
 msgstr "نمایش پیام‌های حذف شده (به صورت خط خورده) در فهرست پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Show deleted messages in the message-list"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "نمایش پیام‌های حذف شده (به صورت خط خورده) در فهرست پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show junk messages in the message-list"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "نمایش پیام‌های حذف شده (به صورت خط خورده) در فهرست پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 #, fuzzy
 #| msgid "Rename the selected folder"
 msgid "Enable Unmatched search folder"
 msgstr "تغییر نام شاخهٔ انتخاب شده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Height of the message-list pane"
 msgstr "ارتفاع قاب فهرست پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Height of the message-list pane."
 msgstr "ارتفاع قاب فهرست پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 #, fuzzy
 #| msgid "Height of the message-list pane"
 msgid "Width of the message-list pane"
 msgstr "ارتفاع قاب فهرست پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 #, fuzzy
 #| msgid "Height of the message-list pane."
 msgid "Width of the message-list pane."
 msgstr "ارتفاع قاب فهرست پیام‌ها."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Layout style"
 msgstr "سبک چینش"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Variable width font"
 msgstr "قلم با عرض متغیر"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 #, fuzzy
 #| msgid "The variable width font for mail display"
 msgid "The variable width font for mail display."
 msgstr "قلم با عرض متغیر برای نمایش نامه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Terminal font"
 msgstr "قلم پایانه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 #, fuzzy
 #| msgid "The terminal font for mail display"
 msgid "The terminal font for mail display."
 msgstr "قلم پایانه برای نمایش نامه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Use custom fonts"
 msgstr "استفاده از قلم‌های سفارشی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 #, fuzzy
 #| msgid "Use custom fonts for displaying mail"
 msgid "Use custom fonts for displaying mail."
 msgstr "استفاده از قلم‌های سفارشی برای نمایش نامه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show mails in headers part of the message preview when name is available"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Thread the message-list based on Subject"
 msgstr "رشته کردن فهرست پیام بر حسب موضوع"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 #, fuzzy
 #| msgid "Default subject for the message."
 msgid "Default value for thread expand state"
 msgstr "موضوع پیش‌گزیده برای پیام."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#, fuzzy
+#| msgid "Whether to hide completed tasks in the tasks view"
+msgid "Whether to compress thread level"
+msgstr "این که تکلیف‌های انجام شده در نمای تکلیف پنهان شوند یا خیر"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Log filter actions"
 msgstr "ثبت اعمال صافی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Log filter actions to the specified log file."
 msgstr "ثبت اعمال صافی در یک پروندهٔ ثبت وقایع مشخص."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Logfile to log filter actions"
 msgstr "پرونده‌ای که اعمال صافی در آن ثبت می‌شوند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Default forward style"
 msgstr "سبک ارجاع پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Default reply style"
 msgstr "سبک پاسخ دادن پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 #, fuzzy
 #| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "_کسب تکلیف هنگام ارسال پیام با خط موضوع خالی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgid ""
 "Prompt the user when he or she tries to send a message with a key accelerator."
 msgstr "کسب تکلیف از کاربر هنگامی که می‌خواهد پیامی بدون موضوع ارسال کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt on empty subject"
 msgstr "کسب تکلیف دربارهٔ موضوع خالی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "کسب تکلیف از کاربر هنگامی که می‌خواهد پیامی بدون موضوع ارسال کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when emptying the trash"
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "سؤال از کاربر زمانی که می‌خواهد شاخه‌ای را حذف کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user expunges"
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "سؤال از کاربر زمانی که می‌خواهد شاخه‌ای را حذف کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when user calls Empty Junk"
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #, fuzzy
 #| msgid "Prompt the user when he or she tries to expunge a folder."
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "سؤال از کاربر زمانی که می‌خواهد شاخه‌ای را حذف کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when user only fills Bcc"
 msgstr "کسب تکلیف هنگامی که کاربر فقط رونوشت محرمانه را پر می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "کسب تکلیف هنگامی که کاربر سعی می‌کند پیامی را بدون گیرنده یا رونوشت ارسال کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "کسب تکلیف هنگامی که کاربر سعی می‌کند HTML ناخواسته ارسال کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -1380,11 +1455,11 @@ msgstr ""
 "کسب تکلیف هنگامی که کاربر سعی می‌کند یک نامهٔ HTML را برای کاربرانی ارسال کند که "
 "شاید نخواهند نامهٔ HTML دریافت کنند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "اعلان هنگام تلاش کاربر برای گشودن هم‌زمان ۱۰ پیام یا بیش‌تر"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if they "
 "really want to do it."
@@ -1392,87 +1467,87 @@ msgstr ""
 "اگر کاربری تلاش کرد ۱۰ پیام یا بیشتر را در آن واحد باز کند، از کاربر سؤال شود آیا "
 "واقعاً مایل به انجام این کار است."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt while marking multiple messages"
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 #, fuzzy
 #| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Prompt when deleting messages in search folder"
 msgstr "_کسب تکلیف هنگام ارسال پیام با خط موضوع خالی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #, fuzzy
 #| msgid "Prompt when user expunges"
 msgid "Prompt when replying privately to list messages"
 msgstr "سئوال وقتی کاربر پاک‌سازی می‌کند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #, fuzzy
 #| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "سؤال کردن هنگام ارسال پیام‌هایی که فقط گیرندهٔ رونوشت محرمانه دارند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 #, fuzzy
 #| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
 msgstr "سؤال کردن هنگام ارسال پیام‌هایی که فقط گیرندهٔ رونوشت محرمانه دارند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 #, fuzzy
 #| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "سؤال کردن هنگام ارسال پیام‌هایی که فقط گیرندهٔ رونوشت محرمانه دارند"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Empty Trash folders on exit"
 msgstr "خالی کردن شاخه‌های زباله‌دان هنگام خروج"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "خالی کردن تمام شاخه‌های زباله‌دان هنگام خروج از اوولوشن."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Minimum days between emptying the trash on exit"
 msgstr "حداقل روزها مابین خالی کردن‌های زباله‌دان هنگام خروج"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "حداقل زمان مابین خالی کردن‌های زباله‌دان هنگام خروج، به روز."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 #, fuzzy
 #| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "آخرین باری که زباله‌دان خالی‌کن اجرا شد"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 #, fuzzy
 #| msgid "The last time empty trash was run, in days since the epoch."
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "آخرین باری که فرمان خالی کردن زباله‌دان اجرا شد، به روز از آغاز زمان."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 #, fuzzy
 #| msgid "Show _Original Size"
 msgid "Show original “Date” header value."
 msgstr "نمایش اندازهٔ ا_صلی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "List of Labels and their associated colors"
 msgstr "فهرست برچسب‌ها و رنگ‌های وابسته به آنها"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains strings "
 "containing name:color where color uses the HTML hex encoding."
@@ -1480,246 +1555,264 @@ msgstr ""
 "فهرست برچسب‌های مؤلفه‌های نامهٔ اوولوشن. این فهرست حاوی رشته‌هایی است که نام:رنگ هستند "
 "که رنگ با استفاده از کدگذاری شانزده‌شانزدهی HTML نوشته می‌شود."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Check incoming mail being junk"
 msgstr "بررسی آشغال بودن نامهٔ دریافتی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 #, fuzzy
 #| msgid "Run junk test on incoming mail"
 msgid "Run junk test on incoming mail."
 msgstr "اجرای آزمایش آشغال روی نامه‌های وارده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 #, fuzzy
 #| msgid "Empty Trash folders on exit"
 msgid "Empty Junk folders on exit"
 msgstr "خالی کردن شاخه‌های زباله‌دان هنگام خروج"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 #, fuzzy
 #| msgid "Empty all Trash folders when exiting Evolution."
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "خالی کردن همهٔ شاخه‌های زباله‌دان هنگام خروج از اوولوشن"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 #, fuzzy
 #| msgid "Minimum days between emptying the trash on exit"
 msgid "Minimum days between emptying the junk on exit"
 msgstr "حداقل روزها مابین خالی کردن‌های زباله‌دان هنگام خروج"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 #, fuzzy
 #| msgid "Minimum time between emptying the trash on exit, in days."
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "حداقل زمان مابین خالی کردن‌های زباله‌دان هنگام خروج، به روز."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 #, fuzzy
 #| msgid "Last time empty trash was run"
 msgid "Last time Empty Junk was run"
 msgstr "آخرین باری که زباله‌دان خالی‌کن اجرا شد"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 #, fuzzy
 #| msgid "The last time empty trash was run, in days since the epoch."
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "آخرین باری که فرمان خالی کردن زباله‌دان اجرا شد، به روز از آغاز زمان."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#, fuzzy
+#| msgid "Check in_coming mail for junk"
+msgid "Determines whether to lookup in address book for sender email"
+msgstr "گشتن در نامه‌های _وارده به دنبال آشغال"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 #, fuzzy
 #| msgid "Check in_coming mail for junk"
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "گشتن در نامه‌های _وارده به دنبال آشغال"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 #, fuzzy
 #| msgid "Check in_coming mail for junk"
 msgid "Custom headers to use while checking for junk."
 msgstr "گشتن در نامه‌های _وارده به دنبال آشغال"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid "UID string of the default account."
 msgstr "رشتهٔ شناسهٔ کاربر حساب پیش‌گزیده."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 msgid "Save directory"
 msgstr "شاخهٔ ذخیره"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#, fuzzy
+#| msgid "Directory for saving reminder audio files"
+msgid "Directory for saving mail component files."
+msgstr "شاخه برای ذخیرهٔ پرونده‌های صوتی یادآور"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 #, fuzzy
 #| msgid "No output directory!"
 msgid "Composer load/attach directory"
 msgstr "شاخهٔ خروجی وجود ندارد!"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Check for new messages on start"
 msgstr "بررسی برای پیام‌های جدید هنگام شروع"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "Check for new messages in all active accounts"
 msgstr "بررسی برای پیام‌های جدید در همهٔ حساب‌های فعّال"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "Server synchronization interval"
 msgstr "دورهٔ همگام‌سازی کارساز"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Allow expunge in virtual folders"
 msgstr "تأیید گرفتن _هنگام پاک‌سازی یک شاخه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "ارث‌بری رنگ‌های زمینه در قالب HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 #, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "این که فیلد مقولات در ویرایشگر رویداد/جلسه نشان داده شود یا نه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 #, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr "این که فیلد مقولات در ویرایشگر رویداد/جلسه نشان داده شود یا نه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 #, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Width of the To Do bar in the main window"
 msgstr "این که فیلد مقولات در ویرایشگر رویداد/جلسه نشان داده شود یا نه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 #, fuzzy
 #| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "این که فیلد مقولات در ویرایشگر رویداد/جلسه نشان داده شود یا نه"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Width of the To Do bar in a sub-window"
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 #, fuzzy
 #| msgid "Whether the toolbar should be visible."
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 #, fuzzy
 #| msgid "View/Hide the Status Bar"
 msgid "Show start up wizard"
 msgstr "نمایش/مخفی کردن نوار وضعیت"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 #, fuzzy
 #| msgid "This message cannot be sent because you have not specified any recipients"
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr "این پیام را نمی‌توان ارسال کرد چون شما گیرنده‌ای مشخص نکرده‌اید"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 #, fuzzy
 #| msgid "Mark the selected messages for deletion"
 msgid "Whether go to the previous message after message deletion"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده برای حذف"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 #, fuzzy
 #| msgid "Visually _Wrap Long Lines"
 msgid "Visually wrap long lines in composer"
 msgstr "_پیچش دیداری خط‌های طولانی"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 #, fuzzy
 #| msgid "Default reply style"
 msgid "Alternative reply style"
 msgstr "سبک پاسخ دادن پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 #, fuzzy
 #| msgid "Format messages in _HTML"
 msgid "Format message in HTML"
 msgstr "_قالب‌بندی پیام در HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#, fuzzy
+#| msgid "Enter the recipients of the message"
+msgid "Put the signature at the top of the message"
+msgstr "گیرنده‌های پیام را وارد کنید"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 #, fuzzy
 #| msgid "Marks the selected calendar for offline viewing."
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "تقویم انتخاب شده را برای نمایش برون‌خط علامت‌گذاری می‌کند."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 #, fuzzy
 #| msgid "Show display alarms in notification tray"
 msgid "Whether display delivery notification parts inline."
 msgstr "نشان دادن هشدارهای نمایشی در سینی اطلاع"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 #, fuzzy
 #| msgid "Send the mail in HTML format"
 msgid "Whether unset colors provided in HTML mails."
 msgstr "ارسال نامه در قالب HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
 #, fuzzy
 #| msgid "Default forward style"
 msgid "(Deprecated) Default forward style"
 msgstr "سبک ارجاع پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
 #, fuzzy
 #| msgid "Default reply style"
 msgid "(Deprecated) Default reply style"
 msgstr "سبک پاسخ دادن پیش‌گزیده"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:315
 #, fuzzy
 #| msgid "List of custom headers and whether they are enabled."
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "فهرست سرنامه‌های سفارشی و این که به کار افتاده‌اند یا نه."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:317
 #, fuzzy
 #| msgid "Load images for HTML messages over http"
 msgid "(Deprecated) Load images for HTML messages over HTTP"
@@ -1808,10 +1901,8 @@ msgid "Whether to notify new messages in Inbox folder only."
 msgstr "هیچ پیامی در این شاخه نیست."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:3
-#, fuzzy
-#| msgid "Unable to retrieve message"
 msgid "Enable D-Bus messages."
-msgstr "بازیابی پیام امکان پذیر نیست"
+msgstr "به کار انداختن پیام‌های دی‌باس"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:4
 #, fuzzy
@@ -1876,10 +1967,8 @@ msgid "Whether to play a sound file."
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#, fuzzy
-#| msgid "Use underline"
 msgid "Use sound theme"
-msgstr "استفاده از زیرخط"
+msgstr "استفاده از زمینهٔ صوتی"
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 #, fuzzy
@@ -1990,16 +2079,12 @@ msgstr ""
 "«نوار ابزار» تنظیم شود، سبک دکمه‌ها از تنظیمات نوار ابزار گنوم تعیین می‌شود."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#, fuzzy
-#| msgid "Sidebar is visible"
 msgid "Menubar is visible"
-msgstr "نوار کناری مرئی است"
+msgstr "نوار فهرست نمایان است"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#, fuzzy
-#| msgid "Whether the sidebar should be visible."
 msgid "Whether the menubar should be visible."
-msgstr "این که نوار کناری مرئی باشد یا نه."
+msgstr "این که نوار فهرست نمایان باشد یا نه."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "Toolbar is visible"
@@ -2018,16 +2103,12 @@ msgid "Whether the sidebar should be visible."
 msgstr "این که نوار کناری مرئی باشد یا نه."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:29
-#, fuzzy
-#| msgid "Sidebar is visible"
 msgid "Statusbar is visible"
-msgstr "نوار کناری مرئی است"
+msgstr "نوار وضعیت نمایان است"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:30
-#, fuzzy
-#| msgid "Whether the sidebar should be visible."
 msgid "Whether the status bar should be visible."
-msgstr "این که نوار کناری مرئی باشد یا نه."
+msgstr "این که نوار وضعیت نمایان باشد یا نه."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:31
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -2063,9 +2144,9 @@ msgid "Whether the text-highlight module is enabled"
 msgstr "این که نوار ابزار مرئی باشد یا نه."
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
-#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1295
+#: ../data/org.gnome.Evolution.desktop.in.in.h:1 ../src/mail/e-mail-browser.c:1293
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
+#: ../src/shell/e-shell-window-private.c:241
 msgid "Evolution"
 msgstr "اوولوشن"
 
@@ -2095,14 +2176,8 @@ msgstr ""
 "یکپارچه شود."
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
-#, fuzzy
-#| msgid ""
-#| "Thanks\n"
-#| "The Evolution Team\n"
 msgid "The Evolution Team"
-msgstr ""
-"با تشکر\n"
-"تیم اوولوشن\n"
+msgstr "گروه اوولوشن"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:352
 msgid "Groupware Suite"
@@ -2119,46 +2194,42 @@ msgstr ""
 "آشنا;مخاطب;دفترچه;وظیفه;تکلیف;"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:6
-#, fuzzy
-#| msgid "New _Window"
 msgid "New Window"
-msgstr "_پنجرهٔ جدید"
+msgstr "پنجرهٔ جدید"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:7
-#, fuzzy
-#| msgid "Compose Message"
 msgid "Compose a Message"
-msgstr "نگارش پیام"
+msgstr "نگارش یک پیام"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
 #: ../src/modules/addressbook/e-book-shell-backend.c:314
-#: ../src/modules/addressbook/e-book-shell-view.c:416
+#: ../src/modules/addressbook/e-book-shell-view.c:421
 msgid "Contacts"
 msgstr "آشنا‌ها"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
-#: ../src/e-util/e-collection-account-wizard.c:839 ../src/e-util/e-send-options.c:544
-#: ../src/e-util/e-webdav-browser.c:470
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
+#: ../src/e-util/e-collection-account-wizard.c:855 ../src/e-util/e-send-options.c:544
+#: ../src/e-util/e-webdav-browser.c:532
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:199
-#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/modules/calendar/e-cal-shell-view.c:631
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "تقویم"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
 #: ../src/mail/importers/elm-importer.c:330
-#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1493
-#: ../src/smime/gui/certificate-manager.c:1666
+#: ../src/modules/mail/e-mail-shell-view.c:1608
+#: ../src/smime/gui/certificate-manager.c:1664
 msgid "Mail"
 msgstr "نامه"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-cal-shell-content.c:1773
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:522
+#: ../src/modules/calendar/e-cal-shell-content.c:1903
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 #: ../src/modules/calendar/e-memo-shell-view.c:335
@@ -2166,15 +2237,15 @@ msgid "Memos"
 msgstr "یادداشت‌ها"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:618 ../src/calendar/gui/print.c:2442
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1141
-#: ../src/e-util/e-webdav-browser.c:461
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#: ../src/modules/calendar/e-cal-shell-content.c:1733
+#: ../src/calendar/importers/icalendar-importer.c:1151
+#: ../src/e-util/e-webdav-browser.c:523
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-cal-shell-content.c:1863
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
-#: ../src/modules/calendar/e-task-shell-view.c:508
+#: ../src/modules/calendar/e-task-shell-view.c:530
 msgid "Tasks"
 msgstr "تکلیف‌ها"
 
@@ -2189,41 +2260,31 @@ msgid "General"
 msgstr "عمومی"
 
 #: ../data/ui/evolution-shortcuts.ui.h:3
-#, fuzzy
-#| msgid "Select all text"
 msgctxt "shortcut window"
 msgid "Select Mail component"
-msgstr "انتخاب همهٔ متن"
+msgstr "گزینش مولّفه‌های نامه"
 
 #: ../data/ui/evolution-shortcuts.ui.h:4
-#, fuzzy
-#| msgid "Select Address Book"
 msgctxt "shortcut window"
 msgid "Select Contacts component"
-msgstr "انتخاب دفترچهٔ نشانی"
+msgstr "گزینش مولّفه‌های آشنایان"
 
 # "ویرایش‌گر تقویم/تکلیف Evolution"
 #: ../data/ui/evolution-shortcuts.ui.h:5
-#, fuzzy
-#| msgid "Evolution's Calendar component"
 msgctxt "shortcut window"
 msgid "Select Calendar component"
-msgstr "Evolution's Calendar component"
+msgstr "گزینش مولّفه‌های تقویم"
 
 # "مؤلفه‌ی آزمایش اوولوشن"
 #: ../data/ui/evolution-shortcuts.ui.h:6
-#, fuzzy
-#| msgid "Evolution's Tasks component"
 msgctxt "shortcut window"
 msgid "Select Tasks component"
-msgstr "Evolution's Tasks component"
+msgstr "گزینش مولّفه‌های وظیفه"
 
 #: ../data/ui/evolution-shortcuts.ui.h:7
-#, fuzzy
-#| msgid "Evolution's Memos component"
 msgctxt "shortcut window"
 msgid "Select Memos component"
-msgstr "Evolution's Memos component"
+msgstr "گزینش مولّفه‌های یادداشت‌ها"
 
 #: ../data/ui/evolution-shortcuts.ui.h:8
 #, fuzzy
@@ -2558,11 +2619,11 @@ msgstr "نمای هفتهٔ کاری"
 msgid "As Sent Folder for Wi_de View"
 msgstr "به عنوان شاخهٔ ار_سالی"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2603
 msgid "_Memos"
 msgstr "_یادداشت‌ها"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2607
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "ت_کلیف‌ها"
@@ -2730,19 +2791,20 @@ msgstr ""
 
 #: ../src/addressbook/addressbook.error.xml.h:32
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:767
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1493
 #: ../src/e-util/e-accounts-window.c:1563
-#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1330 ../src/mail/em-vfolder-editor-rule.c:408
-#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
-#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/e-util/e-mail-signature-manager.c:324
+#: ../src/e-util/e-name-selector-dialog.c:1026 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721 ../src/mail/e-mail-label-manager.c:355
+#: ../src/mail/em-folder-properties.c:1359 ../src/mail/em-vfolder-editor-rule.c:405
+#: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:420
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:544
-#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:464
+#: ../src/plugins/sender-validation/sender-validation.c:498
+#: ../src/plugins/templates/templates.c:470
 msgid "_Add"
 msgstr "ا_ضافه شود"
 
@@ -2785,7 +2847,7 @@ msgstr ""
 "به‌هرحال آن را اضافه کنید؟"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1357
 msgid "Failed to delete contact"
 msgstr "ناتوان در حذف آشنا"
 
@@ -2925,78 +2987,78 @@ msgid "Show Certificates"
 msgstr "گواهی‌ها"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3112
 msgid "Contact Editor"
 msgstr "ویرایش‌گر آشنا"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2486
+#: ../src/em-format/e-mail-formatter-attachment.c:314 ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "گزینه‌ها"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:762
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1437
 #: ../src/calendar/gui/e-cal-dialogs.c:690
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
-#: ../src/composer/e-composer-actions.c:228 ../src/e-util/e-activity-bar.c:357
-#: ../src/e-util/e-attachment-dialog.c:309 ../src/e-util/e-attachment-store.c:658
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
+#: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
+#: ../src/e-util/e-attachment-dialog.c:289 ../src/e-util/e-attachment-store.c:658
 #: ../src/e-util/e-attachment-store.c:668 ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
 #: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
 #: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
-#: ../src/e-util/e-collection-account-wizard.c:238
-#: ../src/e-util/e-collection-account-wizard.c:1864
-#: ../src/e-util/e-collection-account-wizard.c:2100
+#: ../src/e-util/e-collection-account-wizard.c:240
+#: ../src/e-util/e-collection-account-wizard.c:1887
+#: ../src/e-util/e-collection-account-wizard.c:2134
 #: ../src/e-util/e-color-chooser-widget.c:125 ../src/e-util/e-filter-datespec.c:300
-#: ../src/e-util/e-html-editor-actions.c:342
-#: ../src/e-util/e-html-editor-actions.c:386
-#: ../src/e-util/e-html-editor-actions.c:489
+#: ../src/e-util/e-html-editor-actions.c:362
+#: ../src/e-util/e-html-editor-actions.c:406
+#: ../src/e-util/e-html-editor-actions.c:509
 #: ../src/e-util/e-image-chooser-dialog.c:179
-#: ../src/e-util/e-mail-signature-script-dialog.c:366 ../src/e-util/e-passwords.c:468
-#: ../src/e-util/e-rule-context.c:816 ../src/e-util/e-rule-editor.c:187
-#: ../src/e-util/e-rule-editor.c:298 ../src/e-util/e-rule-editor.c:933
-#: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:360
-#: ../src/e-util/e-source-selector-dialog.c:370 ../src/e-util/e-table-config.c:548
+#: ../src/e-util/e-mail-signature-script-dialog.c:358 ../src/e-util/e-passwords.c:468
+#: ../src/e-util/e-rule-context.c:819 ../src/e-util/e-rule-editor.c:184
+#: ../src/e-util/e-rule-editor.c:295 ../src/e-util/e-rule-editor.c:930
+#: ../src/e-util/e-send-options.ui.h:16 ../src/e-util/e-source-config-dialog.c:356
+#: ../src/e-util/e-source-selector-dialog.c:325 ../src/e-util/e-table-config.c:540
 #: ../src/e-util/e-table-config.ui.h:3 ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3963
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4044
+#: ../src/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:3996
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:265
+#: ../src/mail/e-mail-config-window.c:310 ../src/mail/e-mail-label-dialog.c:186
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4054
 #: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
 #: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
 #: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
 #: ../src/mail/mail-vfolder-ui.c:271
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:277
-#: ../src/modules/backup-restore/evolution-backup-tool.c:936
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1226
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:406
 #: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../src/plugins/face/face.c:298
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:417
+#: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:723
-#: ../src/smime/gui/certificate-manager.c:951
-#: ../src/smime/gui/certificate-manager.c:1332 ../src/smime/gui/e-cert-selector.c:235
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:949
+#: ../src/smime/gui/certificate-manager.c:1330 ../src/smime/gui/e-cert-selector.c:235
 #: ../src/smime/gui/smime-ui.ui.h:17
 #, fuzzy
 #| msgid "Cancel"
@@ -3004,31 +3066,31 @@ msgid "_Cancel"
 msgstr "انصراف"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
-#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2158
-#: ../src/composer/e-composer-actions.c:228 ../src/composer/e-composer-actions.c:340
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:765
+#: ../src/calendar/calendar.error.xml.h:47 ../src/calendar/gui/e-comp-editor.c:2237
+#: ../src/composer/e-composer-actions.c:242 ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848 ../src/e-util/e-attachment-store.c:855
-#: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:3963
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
+#: ../src/e-util/e-mail-signature-script-dialog.c:362
+#: ../src/e-util/e-webdav-browser.c:2631 ../src/e-util/e-web-view.c:3996
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:266
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:651
-#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:653
+#: ../src/smime/gui/certificate-manager.c:722
 msgid "_Save"
 msgstr "ذخیره"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2055 ../src/calendar/gui/e-comp-editor.c:2127
-#: ../src/e-util/e-preferences-window.c:390 ../src/e-util/e-send-options.ui.h:15
+#: ../src/calendar/gui/e-comp-editor.c:2134 ../src/calendar/gui/e-comp-editor.c:2206
+#: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell-window-actions.c:1053
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "_Help"
 msgstr "راهنما"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3574
+#: ../src/e-util/e-misc-utils.c:3585
 msgid "Image"
 msgstr "تصویر"
 
@@ -3054,8 +3116,8 @@ msgid "Full _Name..."
 msgstr "_نام کامل…"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:920
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1334
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "رایانامه"
@@ -3079,7 +3141,7 @@ msgid "Instant Messaging"
 msgstr "پیام‌رسانی فوری"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
-#: ../src/addressbook/importers/evolution-vcard-importer.c:981
+#: ../src/addressbook/importers/evolution-vcard-importer.c:828
 msgid "Contact"
 msgstr "آشنا"
 
@@ -3088,8 +3150,8 @@ msgid "_Home Page:"
 msgstr "صفحهٔ آغازه:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:884
-#: ../src/modules/itip-formatter/itip-view.c:1907
+#: ../src/calendar/gui/e-comp-editor-event.c:871
+#: ../src/modules/itip-formatter/itip-view.c:1985
 msgid "_Calendar:"
 msgstr "تقویم:"
 
@@ -3106,7 +3168,7 @@ msgid "Home Page:"
 msgstr "صفحهٔ خانگی:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
-#: ../src/modules/cal-config-google/e-cal-config-google.c:97
+#: ../src/modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "تقویم:"
 
@@ -3177,22 +3239,22 @@ msgid "_Anniversary:"
 msgstr "سالگرد:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1051
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2098
+#: ../src/calendar/gui/e-calendar-view.c:2228
 msgid "Anniversary"
 msgstr "سالگرد"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2097
+#: ../src/calendar/gui/e-calendar-view.c:2227
 msgid "Birthday"
 msgstr "روز تولد"
 
 #. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../src/mail/e-mail-config-defaults-page.c:888
+#: ../src/mail/e-mail-config-defaults-page.c:883
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -3228,23 +3290,23 @@ msgid "_Address:"
 msgstr "نشانی:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:83
-#: ../src/addressbook/gui/widgets/e-contact-map.c:367
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:85
+#: ../src/addressbook/gui/widgets/e-contact-map.c:419
 msgid "Home"
 msgstr "منزل"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
-#: ../src/addressbook/gui/widgets/e-contact-map.c:380
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1019
+#: ../src/addressbook/gui/widgets/e-contact-map.c:432
 msgid "Work"
 msgstr "کاری"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
-#: ../src/calendar/gui/e-cal-model.c:3792
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:86
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:528
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1085
+#: ../src/calendar/gui/e-cal-model.c:3827
 msgid "Other"
 msgstr "دیگر"
 
@@ -3270,19 +3332,20 @@ msgstr "افزودن _X.509"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1509
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
-#: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.error.xml.h:18
+#: ../src/e-util/e-mail-signature-manager.c:364
+#: ../src/e-util/e-name-selector-dialog.c:1030 ../src/e-util/filter.error.xml.h:18
 #: ../src/e-util/filter.ui.h:27 ../src/mail/e-mail-config-identity-page.c:872
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1336 ../src/mail/em-vfolder-editor-rule.c:642
+#: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1365 ../src/mail/em-vfolder-editor-rule.c:639
 #: ../src/mail/mail-config.ui.h:64
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:554
-#: ../src/plugins/email-custom-header/email-custom-header.c:849
-#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/email-custom-header/email-custom-header.c:836
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:474
+#: ../src/plugins/sender-validation/sender-validation.c:508
+#: ../src/plugins/templates/templates.c:480
 msgid "_Remove"
 msgstr "_حذف"
 
@@ -3299,142 +3362,143 @@ msgstr "_بار کردن X.509"
 msgid "Certificates"
 msgstr "گواهی‌ها"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/e-util/e-html-editor-actions.c:1004
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../src/calendar/gui/e-comp-editor.c:2169
+#: ../src/e-util/e-html-editor-actions.c:1133
 msgid "_Undo"
 msgstr "_برگردان"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
-#: ../src/calendar/gui/e-comp-editor.c:2092 ../src/e-util/e-focus-tracker.c:147
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../src/calendar/gui/e-comp-editor.c:2171 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "برگردان"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
-#: ../src/calendar/gui/e-comp-editor.c:2097 ../src/e-util/e-html-editor-actions.c:990
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../src/calendar/gui/e-comp-editor.c:2176
+#: ../src/e-util/e-html-editor-actions.c:1119
 msgid "_Redo"
 msgstr "_انجام دوباره"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
-#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:163
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../src/calendar/gui/e-comp-editor.c:2178 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "انجام دوباره"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "خطا در اضافه کردن آشنا"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:322
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "خطا در تغییر دادن آشنا"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "خطا در حذف آشنا"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, fuzzy, c-format
 #| msgid "Contact Editor - %s"
 msgid "Contact Editor — %s"
 msgstr "ویرایش‌گر آشنا ـ %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3242
 #, fuzzy
 #| msgid "Certificates"
 msgid "X.509 certificates"
 msgstr "گواهی‌ها"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid "PGP keys"
 msgstr "کلیدهای PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
-#: ../src/e-util/e-html-editor-actions.c:395
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3253
+#: ../src/e-util/e-html-editor-actions.c:415
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:672
-#: ../src/smime/gui/certificate-manager.c:961
+#: ../src/smime/gui/certificate-manager.c:674
+#: ../src/smime/gui/certificate-manager.c:959
 #, fuzzy
 #| msgid "Attach file(s)"
 msgid "All files"
 msgstr "پیوست پرونده‌(ها‏)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3273
 #, fuzzy
 #| msgid "PGP/GPG _Key ID:"
 msgid "Open PGP key"
 msgstr "شناسهٔ _کلید PGP/GPG:"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3273
 #, fuzzy
 #| msgid "Select certificate"
 msgid "Open X.509 certificate"
 msgstr "انتخاب گواهی"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4344
 #: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
-#: ../src/e-util/e-html-editor-actions.c:342
-#: ../src/e-util/e-html-editor-actions.c:386
-#: ../src/e-util/e-html-editor-actions.c:489
+#: ../src/e-util/e-html-editor-actions.c:362
+#: ../src/e-util/e-html-editor-actions.c:406
+#: ../src/e-util/e-html-editor-actions.c:509
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:949
 msgid "_Open"
 msgstr "_باز کردن"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3290
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3518
 #, fuzzy
 #| msgid "`%s' is not a regular file."
 msgid "Chosen file is not a local file."
 msgstr "'%s' یک پروندهٔ متعارف نیست."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, fuzzy, c-format
 #| msgid "Failed to authenticate.\n"
 msgid "Failed to load certificate: %s"
 msgstr "تأیید هویت شکست خورد.\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3332
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3332
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3503
 msgid "Save PGP key"
 msgstr "ذخیرهٔ کلید PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3503
 #, fuzzy
 #| msgid "Select certificate"
 msgid "Save X.509 certificate"
 msgstr "انتخاب گواهی"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3530
 #, fuzzy, c-format
 #| msgid "Failed to authenticate.\n"
 msgid "Failed to save certificate: %s"
 msgstr "تأیید هویت شکست خورد.\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4334
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
 msgid "Please select an image for this contact"
 msgstr "لطفاً تصویری برای این آشنا انتخاب کنید"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4345
 msgid "_No image"
 msgstr "بدون تصویر"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4709
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -3442,57 +3506,57 @@ msgstr ""
 "داده‌های آشنا نامعتبر است:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4715
 #, fuzzy, c-format
 #| msgid "'%s' has an invalid format"
 msgid "“%s” has an invalid format"
 msgstr "'%s' قالبی نامعتبر دارد"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4723
 #, fuzzy, c-format
 #| msgid "'%s' cannot be a future date"
 msgid "“%s” cannot be a future date"
 msgstr "'%s' نمی‌تواند تاریخی در آینده باشد"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4731
 #, fuzzy, c-format
 #| msgid "%s'%s' has an invalid format"
 msgid "%s“%s” has an invalid format"
 msgstr "%s'%s' قالبی نامعتبر دارد"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4744
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4758
 #, fuzzy, c-format
 #| msgid "%s'%s' is empty"
 msgid "%s“%s” is empty"
 msgstr "%s'%s' خالی است"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4773
 msgid "Invalid contact."
 msgstr "آشنای نامعتبر."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:221
+#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:213
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
-#: ../src/e-util/e-attachment-dialog.c:311 ../src/e-util/e-categories-dialog.c:81
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:306
+#: ../src/e-util/e-attachment-dialog.c:291 ../src/e-util/e-categories-dialog.c:81
 #: ../src/e-util/e-category-editor.c:258 ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126 ../src/e-util/e-filter-datespec.c:301
-#: ../src/e-util/e-html-editor-link-dialog.c:243 ../src/e-util/e-passwords.c:469
-#: ../src/e-util/e-rule-context.c:817 ../src/e-util/e-rule-editor.c:188
-#: ../src/e-util/e-rule-editor.c:299 ../src/e-util/e-rule-editor.c:934
-#: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:361
-#: ../src/e-util/e-source-selector-dialog.c:371 ../src/e-util/e-table-config.c:549
+#: ../src/e-util/e-html-editor-link-dialog.c:240 ../src/e-util/e-passwords.c:469
+#: ../src/e-util/e-rule-context.c:820 ../src/e-util/e-rule-editor.c:185
+#: ../src/e-util/e-rule-editor.c:296 ../src/e-util/e-rule-editor.c:931
+#: ../src/e-util/e-send-options.ui.h:17 ../src/e-util/e-source-config-dialog.c:357
+#: ../src/e-util/e-source-selector-dialog.c:326 ../src/e-util/e-table-config.c:541
 #: ../src/e-util/e-table-config.ui.h:4 ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
+#: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1331
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 #, fuzzy
 #| msgid "OK"
@@ -3590,7 +3654,7 @@ msgid "_Suffix:"
 msgstr "پسوند:"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:825
 msgid "Contact List Editor"
 msgstr "ویرایش‌گر فهرست آشنا"
 
@@ -3632,14 +3696,14 @@ msgid "_Top"
 msgstr "_بالا"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3673 ../src/e-util/filter.ui.h:29
 #, fuzzy
 #| msgid "_Update"
 msgid "_Up"
 msgstr "_به‌هنگام سازی"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3674 ../src/e-util/filter.ui.h:30
 #, fuzzy
 #| msgid "Move _Down"
 msgid "_Down"
@@ -3652,23 +3716,23 @@ msgstr "جابه‌جایی به _پایین"
 msgid "_Bottom"
 msgstr "پایین:"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:950
 msgid "Contact List Members"
 msgstr "اعضای فهرست آشنا"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1502
 msgid "_Members"
 msgstr "اعضا"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1642
 msgid "Error adding list"
 msgstr "خطا در اضافه کردن فهرست"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1662
 msgid "Error modifying list"
 msgstr "خطا در تغییر دادن فهرست"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1682
 msgid "Error removing list"
 msgstr "خطا در حذف فهرست"
 
@@ -3682,13 +3746,13 @@ msgstr "نام شامل"
 msgid "Email begins with"
 msgstr "شروع رایانامهی با"
 
-#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
-#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#: ../src/addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../src/calendar/gui/caltypes.xml.in.h:27 ../src/calendar/gui/memotypes.xml.in.h:20
+#: ../src/calendar/gui/tasktypes.xml.in.h:38
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1834
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:807
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
 msgid "Any field contains"
 msgstr "همهٔ فیلدهای حاوی"
 
@@ -3703,199 +3767,203 @@ msgid "Copy _Email Address"
 msgstr "رونوشت از نشانی _رایانامه"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:430
+#: ../src/e-util/e-web-view.c:428
 msgid "Copy the email address to the clipboard"
 msgstr "رونوشت از نشانی‌های رایانامه در تخته‌گیره"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:442
+#: ../src/e-util/e-web-view.c:440
 #, fuzzy
 #| msgid "_Send New Message To..."
 msgid "_Send New Message To…"
 msgstr " ار_سال پیام جدید به..."
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:444
+#: ../src/e-util/e-web-view.c:442
 msgid "Send a mail message to this address"
 msgstr "ارسال یک پیعام نامه به این نشانی"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1668
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:317
+#: ../src/e-util/e-misc-utils.c:4550
 #, c-format
 msgid "Click to mail %s"
 msgstr "برای فرستادن نامه به %s کلیک کنید"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:331
 #, fuzzy, c-format
 #| msgid "Click to open %s"
 msgid "Click to open map for %s"
 msgstr "برای باز کردن %s کلیک کنید"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:156
 msgid "Open map"
 msgstr "باز کردن نقشه"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:453
 msgid "SIP"
 msgstr "سیپ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:685
 msgid "List Members:"
 msgstr "اعضای فهرست:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:779
 msgid "Fax"
 msgstr "فکس"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:781
 msgid "Phone"
 msgstr "تلفن"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "لقب"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:926
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:928
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:929
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
 msgid "Yahoo"
 msgstr "یاهو"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
 msgid "Skype"
 msgstr "اسکایپ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
 msgid "Twitter"
 msgstr "توییتر"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
+msgid "Matrix"
+msgstr "ماتریکس"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "شرکت"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:998
 msgid "Department"
 msgstr "بخش"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "دفتر"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 msgid "Profession"
 msgstr "حرفه"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 msgid "Position"
 msgstr "جایگاه"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "مدیر"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "دستیار"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
 msgid "Video Chat"
 msgstr "گپ تصویری"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "آزاد/مشغول"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1075
 msgid "Address"
 msgstr "نشانی"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1045
 msgid "Home Page"
 msgstr "صفحهٔ آغازه"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1046
 msgid "Web Log"
 msgstr "گزارش وب"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1052
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "همسر"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1062
 msgid "Personal"
 msgstr "شخصی"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1107
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "یادداشت"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1296
 msgid "List Members"
 msgstr "اعضای فهرست"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1319
 msgid "Job Title"
 msgstr "عنوان شغل"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1360
 msgid "Home page"
 msgstr "صفحهٔ آغازه"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1370
 msgid "Blog"
 msgstr "بلاگ"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:305
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:306
 #: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1143
 msgid "Cancelled"
 msgstr "صرف نظر شده"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:495
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:496
 msgid "Merge Contact"
 msgstr "ادغام آشنا"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:518
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:768
 msgid "_Merge"
 msgstr "ادغام"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:747
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
 msgid "Duplicate Contact Detected"
 msgstr "آشنای تکراری شناسایی شد"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:805
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:815
 #, fuzzy
 #| msgid ""
 #| "The name or email of this contact already exists in this folder. Would you like "
@@ -3907,7 +3975,7 @@ msgstr ""
 "نام یا رایانامهٔ این آشنا از قبل در این شاخه وجود دارد. آیا می‌خواهید با این وجود آن "
 "را اضافه کنید؟"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:808
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:818
 #, fuzzy
 #| msgid ""
 #| "The name or email address of this contact already exists\n"
@@ -3919,19 +3987,19 @@ msgstr ""
 "نام یا نشانی رایانامه این آشنا از قبل در این شاخه وجود دارد.\n"
 " آیا می‌خواهید با این وجود آن را اضافه کنید؟"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:823
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:833
 msgid "Changed Contact:"
 msgstr "آشنای تغییر یافته:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:825
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:835
 msgid "New Contact:"
 msgstr "آشنای جدید:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:864
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:874
 msgid "Conflicting Contact:"
 msgstr "آشنای متعارض:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:866
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:876
 #, fuzzy
 #| msgid "Contact: "
 msgid "Old Contact:"
@@ -4048,22 +4116,22 @@ msgstr "جابه‌جایی آشنا‌ها به"
 msgid "Copy contacts to"
 msgstr "رونوشت از آشنا‌ها در"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:161
 msgid "No contacts"
 msgstr "بدون آشنا"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:164
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d آشنا"
 msgstr[1] "%d آشنا"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:370
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:371
 msgid "Error getting book view"
 msgstr "خطا در گرفتن نمای کتابی"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-model.c:817
+#: ../src/addressbook/gui/widgets/e-addressbook-model.c:826
 msgid "Search Interrupted"
 msgstr "جست‌وجو با وقفه مواجه شد"
 
@@ -4071,69 +4139,81 @@ msgstr "جست‌وجو با وقفه مواجه شد"
 msgid "Error modifying card"
 msgstr "خطا در تغییر کارت"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:767
 msgid "Cut selected contacts to the clipboard"
 msgstr "بریدن آشنای انتخاب شده و انتقال آن به تخته‌گیره"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:773
 msgid "Copy selected contacts to the clipboard"
 msgstr "رونوشت از آشنای انتخاب شده در تخته‌گیره"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:779
 msgid "Paste contacts from the clipboard"
 msgstr "چسباندن آشنایان از تخته‌گیره"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:785
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "حذف آشنا‌های انتخاب شده"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:791
 msgid "Select all visible contacts"
 msgstr "انتخاب همهٔ آشنا‌های نمایان"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1032
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for the Contacts…"
+msgstr ""
+"\n"
+"\n"
+"درحال جست‌وجو برای آشنایان…"
+
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1405
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "آیا مطمئنید که می‌خواهید این فهرست‌های آشنا را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1409
 msgid "Are you sure you want to delete this contact list?"
 msgstr "آیا مطمئنید که می‌خواهید این فهرست‌ آشنا را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1413
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "آیا مطمئنید که می‌خواهید این فهرست آشنا (%s)‌ را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1419
 msgid "Are you sure you want to delete these contacts?"
 msgstr "آیا مطمئنید که می‌خواهید این آشنا‌یان را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1423
 msgid "Are you sure you want to delete this contact?"
 msgstr "آیا مطمئنید که می‌خواهید این آشنا را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1427
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "آیا مطمئنید که می‌خواهید این آشنا (%s) را حذف کنید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-accounts-window.c:1753
-#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:806
-#: ../src/e-util/e-webdav-browser.c:2697 ../src/mail/e-mail-account-manager.c:739
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1438
+#: ../src/calendar/gui/e-comp-editor.c:2127 ../src/e-util/e-accounts-window.c:1753
+#: ../src/e-util/e-focus-tracker.c:816 ../src/e-util/evolution-source-viewer.c:800
+#: ../src/e-util/e-webdav-browser.c:2855 ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1626
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
-#: ../src/shell/e-shell-window-actions.c:911
-#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/shell/e-shell-window-actions.c:961
+#: ../src/smime/gui/certificate-manager.c:1654 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_حذف شود"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1586
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4148,13 +4228,13 @@ msgstr[1] ""
 "باز کردن %Id آشنا منجر به بازکردن %Id پنجرهٔ جدید خواهد شد.\n"
 "آیا واقعاً می‌خواهید همهٔ این آشنایان را نمایش دهید؟"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1594
 #, fuzzy
 #| msgid "_Don't Display"
 msgid "_Don’t Display"
 msgstr "نمایش نده"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1595
 msgid "Display _All Contacts"
 msgstr "همهٔ آشنایان را نشان بده"
 
@@ -4265,11 +4345,12 @@ msgid "Unit"
 msgstr "واحد"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+#: ../src/modules/mail/em-mailer-prefs.c:2055
 msgid "Title"
 msgstr "عنوان"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:663
+#: ../src/calendar/gui/e-meeting-list-view.c:660
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "نقش"
@@ -4336,15 +4417,15 @@ msgstr "زوم به _داخل"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2861
+#: ../src/mail/e-mail-reader.c:2901
 msgid "Zoom _Out"
 msgstr "زوم به _خارج"
 
 #. Search button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:2081
+#: ../src/e-util/e-html-editor-actions.c:2244
 #: ../src/e-util/e-html-editor-find-dialog.c:244
-#: ../src/shell/e-shell-window-actions.c:981
+#: ../src/shell/e-shell-window-actions.c:1038
 msgid "_Find"
 msgstr "_یافتن"
 
@@ -4413,10 +4494,10 @@ msgstr ""
 
 #: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
-#: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:499
-#: ../src/calendar/importers/icalendar-importer.c:1003
-#: ../src/calendar/importers/icalendar-importer.c:1043
+#: ../src/addressbook/importers/evolution-vcard-importer.c:237
+#: ../src/calendar/importers/icalendar-importer.c:506
+#: ../src/calendar/importers/icalendar-importer.c:1013
+#: ../src/calendar/importers/icalendar-importer.c:1053
 #, fuzzy
 #| msgid "Importing"
 msgid "Importing…"
@@ -4466,11 +4547,11 @@ msgstr "قالب تبادل دادهٔ LDAP ‏(‎.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "واردکنندهٔ LDIF به اوولوشن"
 
-#: ../src/addressbook/importers/evolution-vcard-importer.c:644
+#: ../src/addressbook/importers/evolution-vcard-importer.c:489
 msgid "vCard (.vcf, .gcrd)"
 msgstr "کارت مجازی (.vcf، .gcrd)"
 
-#: ../src/addressbook/importers/evolution-vcard-importer.c:645
+#: ../src/addressbook/importers/evolution-vcard-importer.c:490
 msgid "Evolution vCard Importer"
 msgstr "واردکنندهٔ کارت مجازی اوولوشن"
 
@@ -4561,11 +4642,16 @@ msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "گوگل‌تاک"
 
+#: ../src/addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Matrix"
+msgstr "ماتریکس"
+
 #. To Translators:
 #. * if an email address type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../src/addressbook/util/eab-book-util.c:124
+#: ../src/addressbook/util/eab-book-util.c:125
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "رایانامه"
@@ -4575,7 +4661,7 @@ msgstr "رایانامه"
 #. * this generic label is used instead of one of the predefined labels.
 #. * SIP=Session Initiation Protocol, used for voice over IP
 #.
-#: ../src/addressbook/util/eab-book-util.c:171
+#: ../src/addressbook/util/eab-book-util.c:172
 msgctxt "addressbook-label"
 msgid "SIP"
 msgstr "سیپ"
@@ -4585,7 +4671,7 @@ msgstr "سیپ"
 #. * this generic label is used instead of one of the predefined labels.
 #. * IM=Instant Messaging
 #.
-#: ../src/addressbook/util/eab-book-util.c:214
+#: ../src/addressbook/util/eab-book-util.c:215
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "پیام‌فوری"
@@ -4594,18 +4680,24 @@ msgstr "پیام‌فوری"
 #. * if a phone number type is not one of the predefined types,
 #. * this generic label is used instead of one of the predefined labels.
 #.
-#: ../src/addressbook/util/eab-book-util.c:269
+#: ../src/addressbook/util/eab-book-util.c:270
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "تلفن"
 
 #: ../src/calendar/calendar.error.xml.h:1
-msgid "Would you like to send all the participants a cancelation notice?"
+#, fuzzy
+#| msgid "Would you like to send all the participants a cancelation notice?"
+msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "آیا می‌خواهید برای همهٔ شرکت‌کنندگان اعلان الغا بفرستید؟"
 
 #: ../src/calendar/calendar.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the meeting is canceled."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "meeting is canceled."
 msgstr ""
 "اگر اعلان الغای جلسه نفرستید، شاید شرکت‌کنندگان دیگر نفهمند که جلسه لغو شده است."
@@ -4628,8 +4720,12 @@ msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "همهٔ اطلاعات این جلسه حذف خواهد ‌شد و دیگر قابل برگشت نخواهد بود."
 
 #: ../src/calendar/calendar.error.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the task has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "task has been deleted."
 msgstr ""
 "اگر اعلان الغای تکلیف نفرستید، شاید شرکت‌کنندگان دیگر نفهمند که تکلیف حذف شده است."
@@ -4644,12 +4740,18 @@ msgid "All information on this task will be deleted and can not be restored."
 msgstr "همهٔ اطلاعات این تکلیف حذف خواهد شد و دیگر قابل برگشت نخواهد بود."
 
 #: ../src/calendar/calendar.error.xml.h:11
-msgid "Would you like to send a cancelation notice for this memo?"
+#, fuzzy
+#| msgid "Would you like to send a cancelation notice for this memo?"
+msgid "Would you like to send a cancellation notice for this memo?"
 msgstr "آیا می‌خواهید یک اعلان انصراف برای این یادداشت بفرستید؟"
 
 #: ../src/calendar/calendar.error.xml.h:12
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not know "
+#| "the memo has been deleted."
 msgid ""
-"If you do not send a cancelation notice, the other participants may not know the "
+"If you do not send a cancellation notice, the other participants may not know the "
 "memo has been deleted."
 msgstr ""
 "اگر یک آگهی انصراف نفرستید، شاید شرکت‌کنندگان دیگر نفهمند که یادداشت حذف شده است."
@@ -5364,7 +5466,7 @@ msgstr "عاری از"
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:4 ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1956
+#: ../src/e-util/e-collection-account-wizard.c:1985
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -5391,22 +5493,22 @@ msgstr "برابر است با"
 msgid "is not"
 msgstr "برابر نیست با"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:263
-#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
-#: ../src/calendar/gui/e-task-table.c:445 ../src/calendar/gui/memotypes.xml.in.h:10
+#: ../src/calendar/gui/caltypes.xml.in.h:9 ../src/calendar/gui/e-cal-list-view.c:293
+#: ../src/calendar/gui/e-cal-model.c:293 ../src/calendar/gui/e-cal-model.c:301
+#: ../src/calendar/gui/e-task-table.c:438 ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "عمومی"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:264
-#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
+#: ../src/calendar/gui/caltypes.xml.in.h:10 ../src/calendar/gui/e-cal-list-view.c:294
+#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:439
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "خصوصی"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:265
-#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
+#: ../src/calendar/gui/caltypes.xml.in.h:11 ../src/calendar/gui/e-cal-list-view.c:295
+#: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:440
 #: ../src/calendar/gui/memotypes.xml.in.h:12
-#: ../src/e-util/e-html-editor-page-dialog.c:113 ../src/e-util/e-send-options.ui.h:7
+#: ../src/e-util/e-html-editor-page-dialog.c:116 ../src/e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "محرمانه"
 
@@ -5416,7 +5518,7 @@ msgid "Organizer"
 msgstr "سازمان‌دهنده"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:13
-#: ../src/calendar/gui/e-meeting-list-view.c:623
+#: ../src/calendar/gui/e-meeting-list-view.c:620
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
 #: ../src/calendar/gui/tasktypes.xml.in.h:6
 msgid "Attendee"
@@ -5425,7 +5527,7 @@ msgstr "شرکت‌کنندگان"
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
 #: ../src/calendar/gui/e-task-table.etspec.h:13 ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.c:860
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
 #: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
@@ -5433,7 +5535,7 @@ msgstr "مکان"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:15 ../src/calendar/gui/memotypes.xml.in.h:13
 #: ../src/calendar/gui/tasktypes.xml.in.h:23
-#: ../src/e-util/e-categories-selector.c:328
+#: ../src/e-util/e-categories-selector.c:324
 msgid "Category"
 msgstr "دسته"
 
@@ -5459,7 +5561,7 @@ msgid "Do Not Exist"
 msgstr "وجود ندارد"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
 msgid "Recurrence"
 msgstr "تکرار"
 
@@ -5480,125 +5582,131 @@ msgid "More Than"
 msgstr "بیش‌تر از"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:24 ../src/calendar/gui/memotypes.xml.in.h:17
-#: ../src/calendar/gui/tasktypes.xml.in.h:28
+#: ../src/calendar/gui/tasktypes.xml.in.h:35 ../src/mail/filtertypes.xml.in.h:23
+#: ../src/mail/searchtypes.xml.in.h:25 ../src/mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "اصطلاح"
+
+#: ../src/calendar/gui/caltypes.xml.in.h:25 ../src/calendar/gui/memotypes.xml.in.h:18
+#: ../src/calendar/gui/tasktypes.xml.in.h:36
 msgid "Summary Contains"
 msgstr "خلاصه حاوی"
 
-#: ../src/calendar/gui/caltypes.xml.in.h:25 ../src/calendar/gui/memotypes.xml.in.h:18
-#: ../src/calendar/gui/tasktypes.xml.in.h:29
+#: ../src/calendar/gui/caltypes.xml.in.h:26 ../src/calendar/gui/memotypes.xml.in.h:19
+#: ../src/calendar/gui/tasktypes.xml.in.h:37
 msgid "Description Contains"
 msgstr "شرح‌ها حاوی"
 
-#: ../src/calendar/gui/comp-util.c:1544
-#: ../src/modules/itip-formatter/itip-view.c:2229
+#: ../src/calendar/gui/comp-util.c:1553
+#: ../src/modules/itip-formatter/itip-view.c:2398
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "با یک مهمان"
 msgstr[1] "با %Id مهمان"
 
-#: ../src/calendar/gui/comp-util.c:1603
+#: ../src/calendar/gui/comp-util.c:1612
 #, fuzzy, c-format
 #| msgid "Comment:"
 msgid "Comments: %s"
 msgstr "توضیح:"
 
-#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+#: ../src/calendar/gui/comp-util.c:1626 ../src/calendar/gui/comp-util.c:1629
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/calendar/gui/comp-util.c:1618
+#: ../src/calendar/gui/comp-util.c:1627
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "احتمالی"
 
-#: ../src/calendar/gui/comp-util.c:1619
+#: ../src/calendar/gui/comp-util.c:1628
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "تأییدشده"
 
-#: ../src/calendar/gui/comp-util.c:1621
+#: ../src/calendar/gui/comp-util.c:1630
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "پیش‌نویس"
 
-#: ../src/calendar/gui/comp-util.c:1622
+#: ../src/calendar/gui/comp-util.c:1631
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "نهایی"
 
-#: ../src/calendar/gui/comp-util.c:1623
+#: ../src/calendar/gui/comp-util.c:1632
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "آغازنشده"
 
-#: ../src/calendar/gui/comp-util.c:1624
+#: ../src/calendar/gui/comp-util.c:1633
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "نیازمند کنش"
 
-#: ../src/calendar/gui/comp-util.c:1625
+#: ../src/calendar/gui/comp-util.c:1634
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "در حال پیشرفت"
 
-#: ../src/calendar/gui/comp-util.c:1626
+#: ../src/calendar/gui/comp-util.c:1635
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "کامل‌شده"
 
-#: ../src/calendar/gui/comp-util.c:1627
+#: ../src/calendar/gui/comp-util.c:1636
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "لغوشده"
 
-#: ../src/calendar/gui/ea-cal-view.c:281
+#: ../src/calendar/gui/ea-cal-view.c:277
 msgid "New Appointment"
 msgstr "قرار جدید"
 
-#: ../src/calendar/gui/ea-cal-view.c:282
+#: ../src/calendar/gui/ea-cal-view.c:278
 msgid "New All Day Event"
 msgstr "رویداد تمام‌روز جدید"
 
-#: ../src/calendar/gui/ea-cal-view.c:283
+#: ../src/calendar/gui/ea-cal-view.c:279
 msgid "New Meeting"
 msgstr "جلسهٔ جدید"
 
-#: ../src/calendar/gui/ea-cal-view.c:284
+#: ../src/calendar/gui/ea-cal-view.c:280
 msgid "Go to Today"
 msgstr "رفتن به امروز"
 
-#: ../src/calendar/gui/ea-cal-view.c:285
+#: ../src/calendar/gui/ea-cal-view.c:281
 msgid "Go to Date"
 msgstr "رفتن به تاریخ"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:232
+#: ../src/calendar/gui/ea-cal-view-event.c:229
 msgid "It has reminders."
 msgstr "یادآوری دارد."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:235
+#: ../src/calendar/gui/ea-cal-view-event.c:232
 msgid "It has recurrences."
 msgstr "تکرار دارد."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:238
+#: ../src/calendar/gui/ea-cal-view-event.c:235
 msgid "It is a meeting."
 msgstr "این یک جلسه است."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:242
+#: ../src/calendar/gui/ea-cal-view-event.c:239
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "رویداد تقویم: خلاصه‌اش %s است."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:246
+#: ../src/calendar/gui/ea-cal-view-event.c:243
 msgid "Calendar Event: It has no summary."
 msgstr "رویداد تقویم: خلاصه ندارد."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:269
+#: ../src/calendar/gui/ea-cal-view-event.c:266
 msgid "calendar view event"
 msgstr "رویداد نمای تقویم"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:501
+#: ../src/calendar/gui/ea-cal-view-event.c:498
 msgid "Grab Focus"
 msgstr "گرفتن تمرکز"
 
@@ -5656,28 +5764,28 @@ msgstr "اینجا کلیک کنید، می‌توانید رویدادهای ب
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:387
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2321
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "پخش یک صدا"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:391
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2319
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "وا شدن یک هشدار"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:395
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2325
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "ارسال یک رایانامه"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:399
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2323
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "اجرای یک برنامه"
@@ -5770,109 +5878,111 @@ msgstr "نمای تقویم برای یک ماه"
 msgid "calendar view for one or more weeks"
 msgstr "نمای تقویم برای یک یا چند هفته"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:237
-#: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
+#: ../src/calendar/gui/e-cal-component-preview.c:238
+#: ../src/e-util/e-filter-rule.c:1015 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "بی‌عنوان"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:251
+#: ../src/calendar/gui/e-cal-component-preview.c:252
 msgid "Categories:"
 msgstr "دسته‌ها:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:288
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1635
-#: ../src/modules/itip-formatter/itip-view.c:1746
+#: ../src/calendar/gui/e-cal-component-preview.c:289
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:280
+#: ../src/modules/itip-formatter/itip-view.c:1705
+#: ../src/modules/itip-formatter/itip-view.c:1818
 msgid "Location:"
 msgstr "مکان:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:295
+#: ../src/calendar/gui/e-cal-component-preview.c:296
 msgid "Start Date:"
 msgstr "تاریخ آغاز:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:304
+#: ../src/calendar/gui/e-cal-component-preview.c:305
 msgid "End Date:"
 msgstr "تاریخ پایان:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:313
+#: ../src/calendar/gui/e-cal-component-preview.c:314
 msgid "Due Date:"
 msgstr "تاریخ سررسید:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:326
+#: ../src/calendar/gui/e-cal-component-preview.c:328
 #, fuzzy
 #| msgid "Recurring"
 msgid "Recurs:"
 msgstr "مکرر"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:338
-#: ../src/modules/itip-formatter/itip-view.c:1638
-#: ../src/modules/itip-formatter/itip-view.c:1755
+#: ../src/calendar/gui/e-cal-component-preview.c:340
+#: ../src/modules/itip-formatter/itip-view.c:1709
+#: ../src/modules/itip-formatter/itip-view.c:1830
 msgid "Status:"
 msgstr "وضعیت:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:347
-#: ../src/calendar/gui/e-task-table.c:471 ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-task-table.c:464 ../src/calendar/gui/tasktypes.xml.in.h:19
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:342
 msgid "High"
 msgstr "بالا"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:349
-#: ../src/calendar/gui/e-cal-model.c:1872 ../src/calendar/gui/e-task-table.c:472
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-cal-model.c:1873 ../src/calendar/gui/e-task-table.c:465
 #: ../src/calendar/gui/tasktypes.xml.in.h:20 ../src/e-util/e-send-options.ui.h:5
-#: ../src/mail/message-list.c:333
+#: ../src/mail/message-list.c:341
 msgid "Normal"
 msgstr "عادی"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:351
-#: ../src/calendar/gui/e-task-table.c:473 ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+#: ../src/calendar/gui/e-task-table.c:466 ../src/calendar/gui/tasktypes.xml.in.h:21
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:340
 msgid "Low"
 msgstr "پایین"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:353
+#: ../src/calendar/gui/e-cal-component-preview.c:355
 msgid "Priority:"
 msgstr "اولویت:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:365
+#: ../src/calendar/gui/e-cal-component-preview.c:367
 #, fuzzy
 #| msgid "Or_ganizer:"
 msgid "Organizer:"
 msgstr "_سازمان‌دهنده:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:406
+#: ../src/calendar/gui/e-cal-component-preview.c:408
+#: ../src/modules/itip-formatter/itip-view.c:1711
+#: ../src/modules/itip-formatter/itip-view.c:1836
 #, fuzzy
 #| msgid "Attendees: "
 msgid "Attendees:"
 msgstr "شرکت‌کنندگان: "
 
-#: ../src/calendar/gui/e-cal-component-preview.c:453
-#: ../src/mail/e-mail-config-service-page.c:533
+#: ../src/calendar/gui/e-cal-component-preview.c:455
+#: ../src/mail/e-mail-config-service-page.c:522
 msgid "Description:"
 msgstr "شرح:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:507
+#: ../src/calendar/gui/e-cal-component-preview.c:509
 msgid "Web Page:"
 msgstr "صفحهٔ وب:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1753
+#: ../src/calendar/gui/e-cal-data-model.c:1733
 #, fuzzy, c-format
 #| msgid "Creating folder `%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "در حال ایجاد شاخهٔ '%s'"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1757
+#: ../src/calendar/gui/e-cal-data-model.c:1737
 #, fuzzy, c-format
 #| msgid "Create a new task list"
 msgid "Creating view for task list “%s”"
 msgstr "ایجاد یک فهرست تکلیف جدید"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1761
+#: ../src/calendar/gui/e-cal-data-model.c:1741
 #, fuzzy, c-format
 #| msgid "Create a new memo list"
 msgid "Creating view for memo list “%s”"
 msgstr "ایجاد یک فهرست یادداشت جدید"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1976
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1994
 msgid "Destination is read only"
 msgstr "مقصد فقط خواندنی است"
 
@@ -5907,7 +6017,7 @@ msgid "Select Date"
 msgstr "انتخاب تاریخ"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:689
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Select _Today"
 msgstr "انتخاب ا_مروز"
 
@@ -5995,87 +6105,127 @@ msgstr "این مورد و موارد بعدی"
 msgid "All Instances"
 msgstr "همهٔ موارد"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1173 ../src/calendar/gui/e-cal-dialogs.c:1255
+#: ../src/calendar/gui/e-cal-dialogs.c:1171 ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "یادآوری‌هایم را با این رویداد برایم بفرست"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1175 ../src/calendar/gui/e-cal-dialogs.c:1257
+#: ../src/calendar/gui/e-cal-dialogs.c:1173 ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "فقط شرکت‌کنندگان جدید را باخبر کن"
 
-#: ../src/calendar/gui/e-calendar-view.c:478
+#: ../src/calendar/gui/e-calendar-view.c:492
 msgid "Cut selected events to the clipboard"
 msgstr "بریدن رویدادهای انتخاب شده و انتقال آن به تخته‌گیره"
 
-#: ../src/calendar/gui/e-calendar-view.c:484
+#: ../src/calendar/gui/e-calendar-view.c:498
 msgid "Copy selected events to the clipboard"
 msgstr "رونوشت از رویدادهای انتخاب شده در تخته‌گیره"
 
-#: ../src/calendar/gui/e-calendar-view.c:490
+#: ../src/calendar/gui/e-calendar-view.c:504
 msgid "Paste events from the clipboard"
 msgstr "چسباندن رویدادها از تخته‌گیره"
 
-#: ../src/calendar/gui/e-calendar-view.c:496
+#: ../src/calendar/gui/e-calendar-view.c:510
 msgid "Delete selected events"
 msgstr "حذف رویدادهای انتخاب شده"
 
-#: ../src/calendar/gui/e-calendar-view.c:906
+#: ../src/calendar/gui/e-calendar-view.c:921
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr ""
 
-#: ../src/calendar/gui/e-calendar-view.c:917 ../src/calendar/gui/e-cal-ops.c:1567
+#: ../src/calendar/gui/e-calendar-view.c:932 ../src/calendar/gui/e-cal-ops.c:1585
 #, fuzzy
 #| msgid "Weather Calendars"
 msgid "Default calendar not found"
 msgstr "تقویم‌های آب و هوا"
 
-#: ../src/calendar/gui/e-calendar-view.c:922 ../src/calendar/gui/e-cal-ops.c:1570
+#: ../src/calendar/gui/e-calendar-view.c:937 ../src/calendar/gui/e-cal-ops.c:1588
 #, fuzzy
 #| msgid "Mark  as default folder"
 msgid "Default memo list not found"
 msgstr "به عنوان شاخهٔ پیش‌گزیده علامت‌گذاری شود؟"
 
-#: ../src/calendar/gui/e-calendar-view.c:927 ../src/calendar/gui/e-cal-ops.c:1573
+#: ../src/calendar/gui/e-calendar-view.c:942 ../src/calendar/gui/e-cal-ops.c:1591
 #, fuzzy
 #| msgid "Mark  as default folder"
 msgid "Default task list not found"
 msgstr "به عنوان شاخهٔ پیش‌گزیده علامت‌گذاری شود؟"
 
-#: ../src/calendar/gui/e-calendar-view.c:1019
+#: ../src/calendar/gui/e-calendar-view.c:1034
 msgid "No suitable component found"
 msgstr ""
 
-#: ../src/calendar/gui/e-calendar-view.c:1089
+#: ../src/calendar/gui/e-calendar-view.c:1104
 #, fuzzy
 #| msgid "New Calendar"
 msgid "Pasting iCalendar data"
 msgstr "تقویم جدید"
 
+#: ../src/calendar/gui/e-calendar-view.c:1165
+#: ../src/calendar/gui/e-calendar-view.c:1168
+#: ../src/calendar/gui/e-calendar-view.c:1171
+#: ../src/calendar/gui/e-calendar-view.c:1172
+msgid "%d %b %Y"
+msgstr "%Od %B %Oy"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:1167 ../src/calendar/gui/e-day-view.c:3073
+#: ../src/calendar/gui/e-day-view-top-item.c:856
+#: ../src/calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%Od %B"
+
+#: ../src/calendar/gui/e-calendar-view.c:1178
+msgid "%A %d %b %Y"
+msgstr "%A %Od %B %Oy"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../src/calendar/gui/e-calendar-view.c:1180 ../src/calendar/gui/e-day-view.c:3057
+#: ../src/calendar/gui/e-day-view-top-item.c:852
+#: ../src/calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%A %Od %B"
+
+#: ../src/calendar/gui/e-calendar-view.c:1181
+#: ../src/calendar/gui/e-calendar-view.c:1183
+#: ../src/calendar/gui/e-calendar-view.c:1184
+msgid "%a %d %b %Y"
+msgstr "%A %Od %B %Oy"
+
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1889 ../src/calendar/gui/e-memo-table.c:572
-#: ../src/calendar/gui/e-task-table.c:736
+#: ../src/calendar/gui/e-calendar-view.c:1979 ../src/calendar/gui/e-memo-table.c:561
+#: ../src/calendar/gui/e-task-table.c:730
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "سازمان‌دهنده: %s <%s>"
 
-#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1892 ../src/calendar/gui/e-memo-table.c:577
-#: ../src/calendar/gui/e-task-table.c:740
+#: ../src/calendar/gui/e-calendar-view.c:1982 ../src/calendar/gui/e-memo-table.c:566
+#: ../src/calendar/gui/e-task-table.c:734
 #, c-format
 msgid "Organizer: %s"
 msgstr "سازمان‌دهنده: %s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-calendar-view.c:2001
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-task-table.c:758 ../src/calendar/gui/e-to-do-pane.c:377
+#: ../src/calendar/gui/e-task-table.c:752 ../src/calendar/gui/e-to-do-pane.c:377
 #: ../src/calendar/gui/print.c:3627
 #, c-format
 msgid "Location: %s"
@@ -6083,60 +6233,46 @@ msgstr "مکان: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
 #. Translators: It will display "Time: StartDateAndTime (Duration)"
-#: ../src/calendar/gui/e-calendar-view.c:1970 ../src/calendar/gui/e-to-do-pane.c:480
+#: ../src/calendar/gui/e-calendar-view.c:2060 ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "مدت: %s. %s"
 
+#: ../src/calendar/gui/e-calendar-view.c:2129 ../src/calendar/gui/e-memo-table.c:660
+#: ../src/calendar/gui/e-task-table.c:882 ../src/calendar/gui/e-to-do-pane.c:590
+#: ../src/e-util/e-misc-utils.c:4614 ../src/e-util/e-text.c:566
+#: ../src/e-util/e-web-view.c:4177
+#, fuzzy
+#| msgid "Cell…"
+msgid "…"
+msgstr "سلول…"
+
 #. Translators: the '%s' stands for a component summary, the '%d' for the years.
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:2117
+#: ../src/calendar/gui/e-calendar-view.c:2247
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
 msgstr "%s (%Id)"
 
-#: ../src/calendar/gui/e-calendar-view.c:2318
-#: ../src/calendar/gui/e-calendar-view.c:2321
-#: ../src/calendar/gui/e-calendar-view.c:2324
-#: ../src/calendar/gui/e-calendar-view.c:2325
-msgid "%d %b %Y"
-msgstr "%Od %B %Oy"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2320 ../src/calendar/gui/e-day-view.c:3079
-#: ../src/calendar/gui/e-day-view-top-item.c:858
-#: ../src/calendar/gui/e-week-view-main-item.c:228
-msgid "%d %b"
-msgstr "%Od %B"
-
-#: ../src/calendar/gui/e-calendar-view.c:2331
-msgid "%A %d %b %Y"
-msgstr "%A %Od %B %Oy"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2333 ../src/calendar/gui/e-day-view.c:3063
-#: ../src/calendar/gui/e-day-view-top-item.c:854
-#: ../src/calendar/gui/e-week-view-main-item.c:214
-msgid "%a %d %b"
-msgstr "%A %Od %B"
+#: ../src/calendar/gui/e-cal-list-view.c:116
+#, fuzzy, c-format
+#| msgid "New appointment"
+msgid "%d appointment"
+msgid_plural "%d appointments"
+msgstr[0] "قرار جدید"
+msgstr[1] "قرار جدید"
 
-#: ../src/calendar/gui/e-calendar-view.c:2334
-#: ../src/calendar/gui/e-calendar-view.c:2336
-#: ../src/calendar/gui/e-calendar-view.c:2337
-msgid "%a %d %b %Y"
-msgstr "%A %Od %B %Oy"
+#: ../src/calendar/gui/e-cal-list-view.c:120
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:574
+#, fuzzy, c-format
+#| msgid ", %d selected"
+#| msgid_plural ", %d selected"
+msgid "%d selected"
+msgstr "، %Idتا انتخاب شده"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:1
 #: ../src/calendar/gui/e-memo-table.etspec.h:5
@@ -6170,8 +6306,8 @@ msgstr "منبع"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
-#: ../src/calendar/gui/e-cal-model.c:3846
-#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-cal-model.c:3881
+#: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -6182,119 +6318,119 @@ msgid "Status"
 msgstr "وضعیت"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:11
-#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../src/calendar/gui/e-meeting-list-view.c:646
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3 ../src/e-util/e-accounts-window.c:1443
 #: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1997
-#: ../src/e-util/e-webdav-browser.c:2390 ../src/mail/e-mail-account-tree-view.c:158
+#: ../src/e-util/e-collection-account-wizard.c:2026
+#: ../src/e-util/e-webdav-browser.c:2528 ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "نوع"
 
-#: ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-meeting-list-view.c:183
-#: ../src/calendar/gui/e-meeting-list-view.c:197
+#: ../src/calendar/gui/e-cal-model.c:307
+#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
 #: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
 #: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3395
-#: ../src/modules/itip-formatter/itip-view.c:6440
+#: ../src/modules/itip-formatter/itip-view.c:3510
+#: ../src/modules/itip-formatter/itip-view.c:6502
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "نامعلوم"
 
-#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:615
-#: ../src/calendar/gui/e-cal-ops.c:1252
+#: ../src/calendar/gui/e-cal-model.c:1366 ../src/calendar/gui/e-cal-ops.c:629
+#: ../src/calendar/gui/e-cal-ops.c:1270
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:391
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
-#: ../src/calendar/gui/e-cal-ops.c:1369
+#: ../src/calendar/gui/e-cal-model.c:1477 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1387
 #, fuzzy
 #| msgid "Cannot create a new event"
 msgid "Creating an event"
 msgstr "نمی‌توان رویداد جدیدی ایجاد کرد"
 
-#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
-#: ../src/calendar/gui/e-cal-ops.c:1373
+#: ../src/calendar/gui/e-cal-model.c:1481 ../src/calendar/gui/e-cal-ops.c:198
+#: ../src/calendar/gui/e-cal-ops.c:1391
 #, fuzzy
 #| msgid "Create a new memo"
 msgid "Creating a memo"
 msgstr "ایجاد یک یادداشت جدید"
 
-#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
-#: ../src/calendar/gui/e-cal-ops.c:1377
+#: ../src/calendar/gui/e-cal-model.c:1485 ../src/calendar/gui/e-cal-ops.c:202
+#: ../src/calendar/gui/e-cal-ops.c:1395
 #, fuzzy
 #| msgid "Create a new task"
 msgid "Creating a task"
 msgstr "ایجاد یک تکلیف جدید"
 
-#: ../src/calendar/gui/e-cal-model.c:1874
+#: ../src/calendar/gui/e-cal-model.c:1875
 msgid "Recurring"
 msgstr "مکرر"
 
-#: ../src/calendar/gui/e-cal-model.c:1876
+#: ../src/calendar/gui/e-cal-model.c:1877
 msgid "Assigned"
 msgstr "تخصیص داده شده"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "Yes"
 msgstr "بله"
 
-#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model.c:1880
 #: ../src/calendar/gui/e-cal-model-tasks.c:1097
 msgid "No"
 msgstr "خیر"
 
-#: ../src/calendar/gui/e-cal-model.c:3787
-#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/modules/itip-formatter/itip-view.c:6428
+#: ../src/modules/itip-formatter/itip-view.c:6490
 msgid "Accepted"
 msgstr "پذیرفته شد"
 
-#: ../src/calendar/gui/e-cal-model.c:3788
-#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/modules/itip-formatter/itip-view.c:6434
+#: ../src/modules/itip-formatter/itip-view.c:6496
 msgid "Declined"
 msgstr "رد شد"
 
-#: ../src/calendar/gui/e-cal-model.c:3789
-#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-cal-model.c:3824
+#: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
 msgstr "احتمالی"
 
-#: ../src/calendar/gui/e-cal-model.c:3790
-#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-cal-model.c:3825
+#: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
-#: ../src/modules/itip-formatter/itip-view.c:6437
+#: ../src/modules/itip-formatter/itip-view.c:6499
 msgid "Delegated"
 msgstr "واگذار شد"
 
-#: ../src/calendar/gui/e-cal-model.c:3791
+#: ../src/calendar/gui/e-cal-model.c:3826
 msgid "Needs action"
 msgstr "نیاز به عمل دارد"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:91
-#: ../src/calendar/gui/e-task-table.c:529
+#: ../src/calendar/gui/e-task-table.c:523
 msgid "Free"
 msgstr "آزاد"
 
 #: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:530
+#: ../src/calendar/gui/e-task-table.c:524
 msgid "Busy"
 msgstr "مشغول"
 
@@ -6312,41 +6448,41 @@ msgstr ""
 msgid "In Progress"
 msgstr "در حال اجرا"
 
-#: ../src/calendar/gui/e-cal-ops.c:311
+#: ../src/calendar/gui/e-cal-ops.c:317
 msgid "Modifying an event"
 msgstr "تغییر یک رویداد"
 
-#: ../src/calendar/gui/e-cal-ops.c:315
+#: ../src/calendar/gui/e-cal-ops.c:321
 #, fuzzy
 #| msgid "Loading memos"
 msgid "Modifying a memo"
 msgstr "در حال بار کردن یادداشت‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:319
+#: ../src/calendar/gui/e-cal-ops.c:325
 #, fuzzy
 #| msgid "Loading tasks"
 msgid "Modifying a task"
 msgstr "در حال بار کردن تکلیف‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:417 ../src/calendar/gui/e-to-do-pane.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:426 ../src/calendar/gui/e-to-do-pane.c:2086
 #, fuzzy
 #| msgid "Saving attachment"
 msgid "Removing an event"
 msgstr "در حال ذخیرهٔ پیوست"
 
-#: ../src/calendar/gui/e-cal-ops.c:421 ../src/calendar/gui/e-to-do-pane.c:2078
+#: ../src/calendar/gui/e-cal-ops.c:430 ../src/calendar/gui/e-to-do-pane.c:2090
 #, fuzzy
 #| msgid "Saving attachment"
 msgid "Removing a memo"
 msgstr "در حال ذخیرهٔ پیوست"
 
-#: ../src/calendar/gui/e-cal-ops.c:425 ../src/calendar/gui/e-to-do-pane.c:2082
+#: ../src/calendar/gui/e-cal-ops.c:434 ../src/calendar/gui/e-to-do-pane.c:2094
 #, fuzzy
 #| msgid "Saving attachment"
 msgid "Removing a task"
 msgstr "در حال ذخیرهٔ پیوست"
 
-#: ../src/calendar/gui/e-cal-ops.c:513
+#: ../src/calendar/gui/e-cal-ops.c:522
 #, fuzzy, c-format
 #| msgid "Meeting Information"
 msgid "Deleting an event"
@@ -6354,7 +6490,7 @@ msgid_plural "Deleting %d events"
 msgstr[0] "اطلاعات جلسه"
 msgstr[1] "اطلاعات جلسه"
 
-#: ../src/calendar/gui/e-cal-ops.c:517
+#: ../src/calendar/gui/e-cal-ops.c:526
 #, fuzzy, c-format
 #| msgid "Delegate To"
 msgid "Deleting a memo"
@@ -6362,7 +6498,7 @@ msgid_plural "Deleting %d memos"
 msgstr[0] "واگذاری به"
 msgstr[1] "واگذاری به"
 
-#: ../src/calendar/gui/e-cal-ops.c:521
+#: ../src/calendar/gui/e-cal-ops.c:530
 #, fuzzy, c-format
 #| msgid "Meetings and Tasks"
 msgid "Deleting a task"
@@ -6370,7 +6506,7 @@ msgid_plural "Deleting %d tasks"
 msgstr[0] "جلسه‌ها و تکلیف‌ها"
 msgstr[1] "جلسه‌ها و تکلیف‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:727
+#: ../src/calendar/gui/e-cal-ops.c:741
 #, fuzzy, c-format
 #| msgid "Print this event"
 msgid "Pasting an event"
@@ -6378,7 +6514,7 @@ msgid_plural "Pasting %d events"
 msgstr[0] "چاپ این رویداد"
 msgstr[1] "چاپ این رویداد"
 
-#: ../src/calendar/gui/e-cal-ops.c:742
+#: ../src/calendar/gui/e-cal-ops.c:756
 #, fuzzy, c-format
 #| msgid "Loading memos"
 msgid "Pasting a memo"
@@ -6386,7 +6522,7 @@ msgid_plural "Pasting %d memos"
 msgstr[0] "در حال بار کردن یادداشت‌ها"
 msgstr[1] "در حال بار کردن یادداشت‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:757
+#: ../src/calendar/gui/e-cal-ops.c:771
 #, fuzzy, c-format
 #| msgid "Loading tasks"
 msgid "Pasting a task"
@@ -6394,81 +6530,81 @@ msgid_plural "Pasting %d tasks"
 msgstr[0] "در حال بار کردن تکلیف‌ها"
 msgstr[1] "در حال بار کردن تکلیف‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:853
+#: ../src/calendar/gui/e-cal-ops.c:871
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating an event"
 msgstr "در حال به‌هنگام‌سازی اشیا"
 
-#: ../src/calendar/gui/e-cal-ops.c:857
+#: ../src/calendar/gui/e-cal-ops.c:875
 #, fuzzy
 #| msgid "Updating query"
 msgid "Updating a memo"
 msgstr "به‌هنگام‌سازی پرس‌وجو"
 
-#: ../src/calendar/gui/e-cal-ops.c:861
+#: ../src/calendar/gui/e-cal-ops.c:879
 #, fuzzy
 #| msgid "Updating objects"
 msgid "Updating a task"
 msgstr "در حال به‌هنگام‌سازی اشیا"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:992
 #, fuzzy, c-format
 #| msgid "Permission denied to open the calendar"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "باز کردن تقویم مجاز نیست."
 
-#: ../src/calendar/gui/e-cal-ops.c:978
+#: ../src/calendar/gui/e-cal-ops.c:996
 #, c-format
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:982
+#: ../src/calendar/gui/e-cal-ops.c:1000
 #, c-format
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1026
 #, fuzzy, c-format
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Purging events in the calendar “%s”"
 msgstr "قرار در تقویم «%s» پیدا شد"
 
-#: ../src/calendar/gui/e-cal-ops.c:1012
+#: ../src/calendar/gui/e-cal-ops.c:1030
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:1016
+#: ../src/calendar/gui/e-cal-ops.c:1034
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-cal-ops.c:1111
+#: ../src/calendar/gui/e-cal-ops.c:1129
 #, fuzzy
 #| msgid "Purging"
 msgid "Purging events"
 msgstr "در حال پاک‌سازی"
 
-#: ../src/calendar/gui/e-cal-ops.c:1115
+#: ../src/calendar/gui/e-cal-ops.c:1133
 #, fuzzy
 #| msgid "Print Memos"
 msgid "Purging memos"
 msgstr "چاپ یادداشت‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:1119
+#: ../src/calendar/gui/e-cal-ops.c:1137
 #, fuzzy
 #| msgid "Print Tasks"
 msgid "Purging tasks"
 msgstr "چاپ تکلیف‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:1221
+#: ../src/calendar/gui/e-cal-ops.c:1239
 #, fuzzy
 #| msgid "Hide completed tasks"
 msgid "Expunging completed tasks"
 msgstr "مخفی کردن تکلیف‌های انجام شده"
 
-#: ../src/calendar/gui/e-cal-ops.c:2069
+#: ../src/calendar/gui/e-cal-ops.c:2087
 #, fuzzy, c-format
 #| msgid "Moving messages"
 msgid "Moving an event"
@@ -6476,7 +6612,7 @@ msgid_plural "Moving %d events"
 msgstr[0] "در حال جابه‌جایی پیام‌ها"
 msgstr[1] "در حال جابه‌جایی پیام‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:2070
+#: ../src/calendar/gui/e-cal-ops.c:2088
 #, fuzzy, c-format
 #| msgid "Copying messages"
 msgid "Copying an event"
@@ -6484,7 +6620,7 @@ msgid_plural "Copying %d events"
 msgstr[0] "در حال رونوشت از پیام‌ها"
 msgstr[1] "در حال رونوشت از پیام‌ها"
 
-#: ../src/calendar/gui/e-cal-ops.c:2076
+#: ../src/calendar/gui/e-cal-ops.c:2094
 #, fuzzy, c-format
 #| msgid "Moving items"
 msgid "Moving a memo"
@@ -6492,7 +6628,7 @@ msgid_plural "Moving %d memos"
 msgstr[0] "در حال جابه‌جایی موارد"
 msgstr[1] "در حال جابه‌جایی موارد"
 
-#: ../src/calendar/gui/e-cal-ops.c:2077
+#: ../src/calendar/gui/e-cal-ops.c:2095
 #, fuzzy, c-format
 #| msgid "Copying items"
 msgid "Copying a memo"
@@ -6500,7 +6636,7 @@ msgid_plural "Copying %d memos"
 msgstr[0] "در حال رونوشت از موارد"
 msgstr[1] "در حال رونوشت از موارد"
 
-#: ../src/calendar/gui/e-cal-ops.c:2083
+#: ../src/calendar/gui/e-cal-ops.c:2101
 #, fuzzy, c-format
 #| msgid "Moving items"
 msgid "Moving a task"
@@ -6508,7 +6644,7 @@ msgid_plural "Moving %d tasks"
 msgstr[0] "در حال جابه‌جایی موارد"
 msgstr[1] "در حال جابه‌جایی موارد"
 
-#: ../src/calendar/gui/e-cal-ops.c:2084
+#: ../src/calendar/gui/e-cal-ops.c:2102
 #, fuzzy, c-format
 #| msgid "Copying items"
 msgid "Copying a task"
@@ -6542,214 +6678,229 @@ msgstr ""
 msgid "Event’s time is in the past"
 msgstr "زمان شروع رویداد در گذشته است"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:210
+#: ../src/calendar/gui/e-comp-editor-event.c:204
 #, fuzzy
 #| msgid "Event cannot be edited, because the selected calendar is read only"
 msgid "Event cannot be edited, because the selected calendar could not be opened"
 msgstr "رویداد نمی‌تواند ویرایش شود، زیرا تقویم انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:212
+#: ../src/calendar/gui/e-comp-editor-event.c:206
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr "رویداد نمی‌تواند ویرایش شود، زیرا تقویم انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:214
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "رویداد نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
+#: ../src/calendar/gui/e-comp-editor-event.c:208
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the event will not be sent to the attendees, because you are not "
+"the organizer"
+msgstr "یادداشت نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:506
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:500
+#: ../src/calendar/gui/e-comp-editor-task.c:584
 #, fuzzy
 #| msgid "Start date is wrong"
 msgid "Start date is not a valid date"
 msgstr "تاریخ آغاز اشتباه است"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:508
+#: ../src/calendar/gui/e-comp-editor-event.c:502
 #, fuzzy
 #| msgid "Start time is wrong"
 msgid "Start time is not a valid time"
 msgstr "زمان آغاز اشتباه است"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:512
-#: ../src/calendar/gui/e-comp-editor-event.c:528
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-event.c:522
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:338
-#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:4262
-#: ../src/e-util/e-misc-utils.c:4274 ../src/e-util/e-misc-utils.c:4288
-#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2359
-#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3838
-#: ../src/mail/em-composer-utils.c:3869 ../src/mail/mail-send-recv.c:598
-#: ../src/mail/mail-send-recv.c:1493
+#: ../src/calendar/gui/e-comp-editor.c:340 ../src/composer/e-composer-actions.c:180
+#: ../src/em-format/e-mail-part-secure-button.c:97 ../src/e-util/e-misc-utils.c:4003
+#: ../src/e-util/e-misc-utils.c:4015 ../src/e-util/e-misc-utils.c:4029
+#: ../src/mail/e-mail-autoconfig.c:1041 ../src/mail/e-mail-display.c:2449
+#: ../src/mail/e-mail-notes.c:877 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3843 ../src/mail/em-composer-utils.c:3874
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
-#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
-#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
+#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1238
+#: ../src/shell/e-shell.c:1263 ../src/smime/gui/certificate-manager.c:360
 #, c-format
 msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:516
 #, fuzzy
 #| msgid "The calendar attached is not valid"
 msgid "End date is not a valid date"
 msgstr "تقویم پیوست شده معتبر نیست"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:524
+#: ../src/calendar/gui/e-comp-editor-event.c:518
 #, fuzzy
 #| msgid "invalid time"
 msgid "End time is not a valid time"
 msgstr "زمان نامعتبر"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:726
-#: ../src/calendar/gui/e-comp-editor-memo.c:134
-#: ../src/calendar/gui/e-comp-editor-task.c:704
+#: ../src/calendar/gui/e-comp-editor-event.c:713
+#: ../src/calendar/gui/e-comp-editor-memo.c:258
+#: ../src/calendar/gui/e-comp-editor-task.c:697
 msgid "_Categories"
 msgstr "دسته‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:728
-#: ../src/calendar/gui/e-comp-editor-memo.c:136
-#: ../src/calendar/gui/e-comp-editor-task.c:706
+#: ../src/calendar/gui/e-comp-editor-event.c:715
+#: ../src/calendar/gui/e-comp-editor-memo.c:260
+#: ../src/calendar/gui/e-comp-editor-task.c:699
 msgid "Toggles whether to display categories"
 msgstr "این که دسته‌ها نشان داده شوند یا نه"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:734
-#: ../src/calendar/gui/e-comp-editor-task.c:712
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-task.c:705
 msgid "Time _Zone"
 msgstr "منطقهٔ زمانی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:736
-#: ../src/calendar/gui/e-comp-editor-task.c:714
+#: ../src/calendar/gui/e-comp-editor-event.c:723
+#: ../src/calendar/gui/e-comp-editor-task.c:707
 msgid "Toggles whether the time zone is displayed"
 msgstr "ضامن این که منطقهٔ زمانی نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:742
+#: ../src/calendar/gui/e-comp-editor-event.c:729
 msgid "All _Day Event"
 msgstr "رویداد تمام‌ روز"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:744
+#: ../src/calendar/gui/e-comp-editor-event.c:731
 msgid "Toggles whether to have All Day Event"
 msgstr "ضامن این که فیلد رویداد تمام‌روز نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:750
+#: ../src/calendar/gui/e-comp-editor-event.c:737
 msgid "Show Time as _Busy"
 msgstr "نشان دادن زمان به شکل مشغول"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:752
+#: ../src/calendar/gui/e-comp-editor-event.c:739
 msgid "Toggles whether to show time as busy"
 msgstr "ضامن این که زمان به شکل مشغول نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:761
+#: ../src/calendar/gui/e-comp-editor-event.c:748
 msgid "Pu_blic"
 msgstr "عمومی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:763
+#: ../src/calendar/gui/e-comp-editor-event.c:750
 msgid "Classify as public"
 msgstr "طبقه‌بندی به عنوان عمومی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:768
+#: ../src/calendar/gui/e-comp-editor-event.c:755
 msgid "_Private"
 msgstr "خصوصی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:770
+#: ../src/calendar/gui/e-comp-editor-event.c:757
 msgid "Classify as private"
 msgstr "طبقه‌بندی به عنوان خصوصی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:775
+#: ../src/calendar/gui/e-comp-editor-event.c:762
 msgid "_Confidential"
 msgstr "محرمانه"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:777
+#: ../src/calendar/gui/e-comp-editor-event.c:764
 msgid "Classify as confidential"
 msgstr "طبقه‌بندی به عنوان محرمانه"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:895
+#: ../src/calendar/gui/e-comp-editor-event.c:882
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "زمان _آغاز:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:900
+#: ../src/calendar/gui/e-comp-editor-event.c:887
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "زمان _پایان:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:910
+#: ../src/calendar/gui/e-comp-editor-event.c:897
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "رویداد _تمام‌‌روز"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:978
-#: ../src/calendar/gui/e-comp-editor-memo.c:232
-#: ../src/calendar/gui/e-comp-editor-task.c:882
+#: ../src/calendar/gui/e-comp-editor-event.c:965
+#: ../src/calendar/gui/e-comp-editor-memo.c:359
+#: ../src/calendar/gui/e-comp-editor-task.c:875
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "عمومی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:981
-#: ../src/calendar/gui/e-comp-editor-task.c:905
+#: ../src/calendar/gui/e-comp-editor-event.c:968
+#: ../src/calendar/gui/e-comp-editor-task.c:898
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "یادآوری‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:984
-#: ../src/calendar/gui/e-comp-editor-task.c:909
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-task.c:902
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "تکرار"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:987
-#: ../src/calendar/gui/e-comp-editor-memo.c:235
-#: ../src/calendar/gui/e-comp-editor-task.c:913
+#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-memo.c:362
+#: ../src/calendar/gui/e-comp-editor-task.c:906
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "پیوست‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:997
+#: ../src/calendar/gui/e-comp-editor-event.c:984
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "زمان‌بندی"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1032
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, fuzzy, c-format
 #| msgid "Meeting - %s"
 msgid "Meeting — %s"
 msgstr "جلسه ‐ %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:1033
+#: ../src/calendar/gui/e-comp-editor-event.c:1020
 #, fuzzy, c-format
 #| msgid "Appointment - %s"
 msgid "Appointment — %s"
 msgstr "قرار ‐ %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:96
+#: ../src/calendar/gui/e-comp-editor-memo.c:59
+#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#, fuzzy
+#| msgid "New _Window"
+msgid "New note"
+msgstr "_پنجرهٔ جدید"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:220
 #, fuzzy
 #| msgid "Memo cannot be edited, because the selected memo list is read only"
 msgid "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr "یادداشت نمی‌تواند ویرایش شود، زیرا فهرست یادداشت انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:98
+#: ../src/calendar/gui/e-comp-editor-memo.c:222
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "یادداشت نمی‌تواند ویرایش شود، زیرا فهرست یادداشت انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:100
-msgid "Memo cannot be fully edited, because you are not the organizer"
+#: ../src/calendar/gui/e-comp-editor-memo.c:224
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the memo will not be sent to the attendees, because you are not "
+"the organizer"
 msgstr "یادداشت نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:196
-#: ../src/calendar/gui/e-comp-editor-task.c:813
+#: ../src/calendar/gui/e-comp-editor-memo.c:320
+#: ../src/calendar/gui/e-comp-editor-task.c:806
 msgid "_List:"
 msgstr "فهرست:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:203
-#: ../src/calendar/gui/e-comp-editor-task.c:823
+#: ../src/calendar/gui/e-comp-editor-memo.c:327
+#: ../src/calendar/gui/e-comp-editor-task.c:816
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "تاریخ _آغاز:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:266
+#: ../src/calendar/gui/e-comp-editor-memo.c:394
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Memo — %s"
 msgstr "تکلیف تخصیص داده شده ـ %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:267
+#: ../src/calendar/gui/e-comp-editor-memo.c:395
 #, fuzzy, c-format
 #| msgid "Memo - %s"
 msgid "Memo — %s"
@@ -6757,7 +6908,7 @@ msgstr "یادداشت - %s"
 
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/em-format/e-mail-formatter-attachment.c:373
 #: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
 #: ../src/e-util/e-attachment-paned.c:175 ../src/e-util/e-attachment-paned.c:180
 #: ../src/mail/message-list.etspec.h:4
@@ -6780,7 +6931,7 @@ msgstr "قفل کردن '%s' ممکن نیست"
 msgid "Could not load the attachment"
 msgstr "نوع محتویات پیوست"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:411
 #, fuzzy
 #| msgid ""
 #| "Some attachments are being downloaded. Saving the task would result in the loss "
@@ -6792,65 +6943,65 @@ msgstr ""
 "برخی پیوست‌ها رد حال بارگیری هستند. ذخیرهٔ تکلیف در کمبود این پیوست‌ها نتیجه خواهد "
 "داشت."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:438
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:455
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
-#: ../src/composer/e-composer-actions.c:312
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:623
+#: ../src/composer/e-composer-actions.c:326
 #, fuzzy
 #| msgid "Attachment"
 msgid "_Attachment…"
 msgstr "پیوست"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
-#: ../src/composer/e-composer-actions.c:314 ../src/e-util/e-attachment-view.c:343
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:625
+#: ../src/composer/e-composer-actions.c:328 ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "پیوست کردن یک پرونده"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:632
 #, fuzzy
 #| msgid "Attachments"
 msgid "_Attachments"
 msgstr "پیوست‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:634
 #, fuzzy
 #| msgid "Show _attachments"
 msgid "Show attachments"
 msgstr "نشان دادن پیوست‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
-#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:802
+#: ../src/e-util/e-attachment-bar.c:716 ../src/e-util/e-attachment-paned.c:690
 #, fuzzy
 #| msgid "Month View"
 msgid "Icon View"
 msgstr "نمای ماه"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:804
+#: ../src/e-util/e-attachment-bar.c:718 ../src/e-util/e-attachment-paned.c:692
 #, fuzzy
 #| msgid "_List View"
 msgid "List View"
 msgstr "نمای _فهرست"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:392
+#: ../src/calendar/gui/e-comp-editor-page-general.c:322
 #, c-format
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:399
+#: ../src/calendar/gui/e-comp-editor-page-general.c:329
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:429
+#: ../src/calendar/gui/e-comp-editor-page-general.c:359
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete selected attendee"
@@ -6858,112 +7009,113 @@ msgid_plural "Failed to delete selected attendees"
 msgstr[0] "ناتوان در حذف آشنا"
 msgstr[1] "ناتوان در حذف آشنا"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:543
+#: ../src/calendar/gui/e-comp-editor-page-general.c:473
 msgid "Organizer address is not a valid user mail address"
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:712
+#: ../src/calendar/gui/e-comp-editor-page-general.c:686
 #, fuzzy
 #| msgid "Attendees"
 msgid "A_ttendees"
 msgstr "شرکت‌کنندگان"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:714
+#: ../src/calendar/gui/e-comp-editor-page-general.c:688
 #, fuzzy
 #| msgid "Toggles whether the Attendee Type is displayed"
 msgid "Toggles whether the Attendees are displayed"
 msgstr "این که فیلد نوع شرکت‌کننده نشان داده شود یا نه"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:723
+#: ../src/calendar/gui/e-comp-editor-page-general.c:697
 msgid "R_ole Field"
 msgstr "فیلد _نقش"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:725
+#: ../src/calendar/gui/e-comp-editor-page-general.c:699
 msgid "Toggles whether the Role field is displayed"
 msgstr "ضامن این که فیلد نقش نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:731
+#: ../src/calendar/gui/e-comp-editor-page-general.c:705
 msgid "_RSVP"
 msgstr "_لطفاً پاسخ دهید"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:733
+#: ../src/calendar/gui/e-comp-editor-page-general.c:707
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "ضامن این که فیلد لطفاً پاسخ دهید نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:739
+#: ../src/calendar/gui/e-comp-editor-page-general.c:713
 msgid "_Status Field"
 msgstr "فیلد _وضعیت"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:741
+#: ../src/calendar/gui/e-comp-editor-page-general.c:715
 msgid "Toggles whether the Status field is displayed"
 msgstr "ضامن این که فیلد وضعیت نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:747
+#: ../src/calendar/gui/e-comp-editor-page-general.c:721
 msgid "_Type Field"
 msgstr "فیلد _نوع"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:749
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "این که فیلد نوع شرکت‌کننده نشان داده شود یا نه"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1032
 msgid "An organizer is required."
 msgstr "سازمان‌دهنده‌ای لازم است."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1042
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1184
 msgid "At least one attendee is required."
 msgstr "دست کم یک شرکت‌کننده الزامی است."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1308
 msgid "Or_ganizer:"
 msgstr "_سازمان‌دهنده:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1403
 msgid "Override color of the event. If not set, then color of the calendar is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1405
 msgid "Override color of the memo. If not set, then color of the memo list is used."
 msgstr ""
 
 #. E_SOURCE_EXTENSION_TASK_LIST
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1407
 msgid "Override color of the task. If not set, then color of the task list is used."
 msgstr ""
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1418
 msgctxt "ECompEditor"
 msgid "Atte_ndees…"
 msgstr "_شرکت‌کنندگان…"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
-#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-accounts-window.c:1745
-#: ../src/e-util/e-html-editor-actions.c:1013
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/e-webdav-browser.c:2690
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1501
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2312
+#: ../src/calendar/gui/e-comp-editor.c:2192 ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:1142
+#: ../src/e-util/e-mail-signature-manager.c:354 ../src/e-util/e-webdav-browser.c:2848
 #: ../src/e-util/filter.ui.h:26 ../src/mail/e-mail-account-manager.c:730
-#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
+#: ../src/mail/e-mail-browser.c:217 ../src/mail/e-mail-label-manager.c:364
+#: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:68
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:549
-#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:469
-#: ../src/shell/e-shell-window-actions.c:1039 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/plugins/sender-validation/sender-validation.c:503
+#: ../src/plugins/templates/templates.c:475
+#: ../src/shell/e-shell-window-actions.c:1103 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "ویرایش"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:329
 msgid "Add exception"
 msgstr "افزودن استثنا"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:370
 msgid "Modify exception"
 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.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:503
 msgid "on"
 msgstr "در"
 
@@ -6971,7 +7123,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:584
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "اول"
@@ -6981,7 +7133,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "دوم"
@@ -6990,7 +7142,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "سوم"
@@ -6999,7 +7151,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:600
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "چهارم"
@@ -7008,7 +7160,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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:605
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "پنجم"
@@ -7017,14 +7169,14 @@ 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.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:610
 msgctxt "ECompEditorPageRecur"
 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]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:637
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "تاریخ دیگر"
@@ -7033,7 +7185,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]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:643
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "نخست تا دهم"
@@ -7042,7 +7194,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] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:649
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "یازدهم تا بیستم"
@@ -7051,7 +7203,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] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:655
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
 msgstr "بیست‌ویکم تا سی‌ویکم"
@@ -7059,42 +7211,42 @@ msgstr "بیست‌ویکم تا سی‌ویکم"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (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.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "روز"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "سه‌شنبه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "آدینه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "شنبه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:688
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "یکشنبه"
@@ -7102,136 +7254,136 @@ 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])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:817
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
 msgstr "در روز"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "رخدادها"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2104
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
 msgstr "این قرار _تکرار می‌شود"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1557
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "این تکلیف _تکرار می‌شود"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1562
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "این یادداشت _تکرار می‌شود"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1567
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "این جزء _تکرار می‌شود"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1938
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Recurrence exception date is invalid"
 msgstr "تاریخ تکرار نامعتبر است"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1994
 #, fuzzy
 #| msgid "End time of the recurrence was before event's start"
 msgid "End time of the recurrence is before the start"
 msgstr "زمان پایان تکرار پیش از شروع رویداد بود"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2032
 #, fuzzy
 #| msgid "Recurrence"
 msgid "R_ecurrence"
 msgstr "تکرار"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2034
 #, fuzzy
 #| msgid "It has recurrences."
 msgid "Set or unset recurrence"
 msgstr "تکرار دارد."
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "هر"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2171
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "روز"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2173
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "هفته"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2175
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "ماه"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2177
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "سال"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2206
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "برای"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2208
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "تا"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2210
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "برای همیشه"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2226
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "این قرار تکرارهایی دارد که اوولوشن نمی‌تواند آنها را ویرایش کند."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
 msgid "Exceptions"
 msgstr "استثناها"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2304
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2275
 #: ../src/mail/e-mail-config-identity-page.c:854 ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "افزودن"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2320
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 #: ../src/mail/mail-config.ui.h:69
 #, fuzzy
 #| msgid "Remove"
 msgid "Re_move"
 msgstr "حذف"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2328
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
@@ -7241,18 +7393,18 @@ msgstr "پیش‌نمایش"
 msgid "Send To"
 msgstr "ارسال به:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1694
 msgid "_Reminders"
 msgstr "یادآوری‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1696
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Set or unset reminders"
 msgstr "تنظیم یا بازنشانی یادآوری‌ها برای این رویداد"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1808
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -7260,285 +7412,303 @@ msgstr "هیچ‌کدام"
 #. Translators: This constructs predefined reminder's description, for example "15 minutes before",
 #. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
 #. "2 days 13 hours 1 minute before".
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1818
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s پیش"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1823
 msgctxt "cal-reminders"
 msgid "at the start"
 msgstr "هنشگام شروع"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "سفارشی"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1833
+#, fuzzy
+#| msgid "Add custom predefined time"
+msgid "Add predefined time…"
+msgstr "افزودن زمان از‌پیش تعریف‌شدهٔ سفارشی"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1836
+#, fuzzy
+#| msgid "Remove custom predefined times"
+msgid "Remove predefined times"
+msgstr "برداشتن زمان از‌پیش تعریف‌شدهٔ سفارشی"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1979
 msgid "Set a custom predefined time to"
 msgstr "تنظیم یک زمان از‌پیش تعریف‌شدهٔ سفارشی به"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1992
 msgctxt "cal-reminders"
 msgid "da_ys"
 msgstr "روز"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2008
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "_ساعت"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2024
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "_دقیقه"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
 #, fuzzy
 #| msgid "_End time:"
 msgid "_Add time"
 msgstr "زمان _پایان:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2128
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Reminders"
 msgstr "یادآوری‌ها"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2153
 msgid "_Reminder"
 msgstr "یادآوری"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
-msgid "Add custom predefined time"
-msgstr "افزودن زمان از‌پیش تعریف‌شدهٔ سفارشی"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
-msgid "Remove custom predefined times"
-msgstr "برداشتن زمان از‌پیش تعریف‌شدهٔ سفارشی"
-
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2356
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "دقیقه"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2358
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "ساعت"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2360
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "روز"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2377
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "پیش از"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "پس از"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2395
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "آغاز"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2397
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "پایان"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2416
 #, fuzzy
 #| msgid "_Repeat the reminder"
 msgid "Re_peat the reminder"
 msgstr "تکرار یادآوری"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "زمان اضافی هر"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2478
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "دقیقه"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2480
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "ساعت"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2482
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "روز"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2519
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2676
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "پیام سفارشی"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2563
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "_صدای یادآور سفارشی"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2574
 #, fuzzy
 #| msgid "Select sound file"
 msgid "Select a sound file"
 msgstr "یک پرونده صوتی انتخاب کنید"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2602
 msgid "_Program:"
 msgstr "برنامه:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2627
 msgid "_Arguments:"
 msgstr "_آرگومان‌ها:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2659
 #, fuzzy
 #| msgid "Send To:"
 msgid "_Send To:"
 msgstr "ارسال به:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:479
 #, fuzzy
 #| msgid "Scheduling"
 msgid "_Schedule"
 msgstr "زمان‌بندی"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:481
 msgid "Query free / busy information for the attendees"
 msgstr "پرس و جوی اطلاعات آزاد/مشغول برای این شرکت‌کنندگان"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:92
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_خلاصه:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:387
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_موقعیت:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:521
 msgctxt "ECompEditor"
 msgid "_Categories…"
 msgstr "_دسته‌ها…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+#, fuzzy
+#| msgid "Edit Label"
+msgid "Edit as text"
+msgstr "ویرایش برچسب"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as text"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:624
+msgid "View as HTML"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:711
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_توضیح:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1046
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "صفحهٔ _وب:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1417
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "تاریخ _سررسید:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1511
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "تاریخ تکمیل:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1527
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "عمومی"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1528
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "خصوصی"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1529
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "محرمانه"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1545
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "_طبقه‌بندی:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1608
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_وضعیت:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1638
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "تعریف‌نشده"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1639
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "بالا"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1640
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "عادی"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "پایین"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1650
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "او_لویت:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "درصد تکمیل:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1785
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "منطقهٔ _زمانی:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "نمایش زمان به شکل مشغول"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1960
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2302
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -7555,167 +7725,169 @@ msgstr "تاریخ شروع تکلیف در گذشته است"
 msgid "Task’s due date is in the past"
 msgstr "تاریخ انجام تکلیف در گذشته است"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:530
+#: ../src/calendar/gui/e-comp-editor-task.c:523
 #, fuzzy
 #| msgid "Task cannot be edited, because the selected task list is read only"
 msgid "Task cannot be edited, because the selected task list could not be opened"
 msgstr "تکلیف نمی‌تواند ویرایش شود، زیرا فهرست تکلیف انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:532
+#: ../src/calendar/gui/e-comp-editor-task.c:525
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "تکلیف نمی‌تواند ویرایش شود، زیرا فهرست تکلیف انتخابی فقط خواندنی است"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:534
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "تکلیف نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
+#: ../src/calendar/gui/e-comp-editor-task.c:527
+#, fuzzy
+#| msgid "Memo cannot be fully edited, because you are not the organizer"
+msgid ""
+"Changes made to the task will not be sent to the attendees, because you are not "
+"the organizer"
+msgstr "یادداشت نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:605
+#: ../src/calendar/gui/e-comp-editor-task.c:598
 msgid "Start date is required for recurring tasks"
 msgstr "تکلیف‌های باتکرار نیاز به زمان آغاز دارند"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:621
+#: ../src/calendar/gui/e-comp-editor-task.c:614
 #, fuzzy
 #| msgid "Recurrence date is invalid"
 msgid "Due date is not a valid date"
 msgstr "تاریخ تکرار نامعتبر است"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:632
+#: ../src/calendar/gui/e-comp-editor-task.c:625
 #, fuzzy
 #| msgid "Completed date is wrong"
 msgid "Completed date is not a valid date"
 msgstr "زمان انجام اشتباه است"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:643
+#: ../src/calendar/gui/e-comp-editor-task.c:636
 #, fuzzy
 #| msgid "1 minute in the future"
 #| msgid_plural "%d minutes in the future"
 msgid "Completed date cannot be in the future"
 msgstr "%d دقیقه دیگر"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:713
 #, fuzzy
 #| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "رویداد تمام‌ روز"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:715
 #, fuzzy
 #| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
 msgstr "ضامن این که فیلد رویداد تمام‌روز نشان داده شود را می‌زند"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:946
+#: ../src/calendar/gui/e-comp-editor-task.c:939
 #, fuzzy, c-format
 #| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "تکلیف تخصیص داده شده ـ %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:947
+#: ../src/calendar/gui/e-comp-editor-task.c:940
 #, fuzzy, c-format
 #| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "تکلیف ‐ %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
+#: ../src/calendar/gui/e-comp-editor.c:255
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "پیوست"
 
-#: ../src/calendar/gui/e-comp-editor.c:610
+#: ../src/calendar/gui/e-comp-editor.c:613
 #, fuzzy
 #| msgid "Send u_pdates to attendees"
 msgid "Sending notifications to attendees…"
 msgstr "فرستادن به‌هنگام‌سازی‌ها به شرکت‌کنندگان"
 
-#: ../src/calendar/gui/e-comp-editor.c:985 ../src/e-util/e-webdav-browser.c:1818
+#: ../src/calendar/gui/e-comp-editor.c:1025 ../src/e-util/e-webdav-browser.c:1925
 #, fuzzy
 #| msgid "_Save Changes"
 msgid "Saving changes…"
 msgstr "_ذخیرهٔ تغییرات"
 
-#: ../src/calendar/gui/e-comp-editor.c:1245
+#: ../src/calendar/gui/e-comp-editor.c:1296
 msgid "No Summary"
 msgstr "بدون خلاصه"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2027 ../src/composer/e-composer-actions.c:319
+#: ../src/calendar/gui/e-comp-editor.c:2106 ../src/composer/e-composer-actions.c:333
 #: ../src/e-util/e-accounts-window.c:1778 ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:319
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:399
-#: ../src/e-util/e-table-field-chooser-dialog.c:205 ../src/mail/e-mail-browser.c:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:758 ../src/mail/e-mail-notes.c:964
-#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1458
-#: ../src/mail/em-subscription-editor.c:1741
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
-#: ../src/shell/e-shell-window-actions.c:348
-#: ../src/shell/e-shell-window-actions.c:876
-#: ../src/smime/gui/certificate-manager.c:2196
+#: ../src/e-util/e-table-field-chooser-dialog.c:197 ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:751 ../src/mail/e-mail-notes.c:1017
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1487
+#: ../src/mail/em-subscription-editor.c:1734
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:926
+#: ../src/smime/gui/certificate-manager.c:2176
 msgid "_Close"
 msgstr "بستن"
 
-#: ../src/calendar/gui/e-comp-editor.c:2029
+#: ../src/calendar/gui/e-comp-editor.c:2108
 msgid "Close the current window"
 msgstr "بستن پنجرهٔ جاری"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
-#: ../src/e-util/e-html-editor-actions.c:969 ../src/e-util/e-text.c:2080
-#: ../src/e-util/e-web-view.c:469 ../src/mail/e-mail-browser.c:173
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:897
+#: ../src/calendar/gui/e-comp-editor.c:2113 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1098 ../src/e-util/e-text.c:2065
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:947
 msgid "_Copy"
 msgstr "_رونوشت"
 
-#: ../src/calendar/gui/e-comp-editor.c:2036 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2115 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
-#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:471
-#: ../src/e-util/e-web-view.c:2044 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2055 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Copy the selection"
 msgstr "رونوشت از انتخاب شده‌ها"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
-#: ../src/e-util/e-html-editor-actions.c:976 ../src/e-util/e-text.c:2066
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:904
+#: ../src/calendar/gui/e-comp-editor.c:2120 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1105 ../src/e-util/e-text.c:2051
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:954
 msgid "Cu_t"
 msgstr "_بریدن"
 
-#: ../src/calendar/gui/e-comp-editor.c:2043 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2122 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
-#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2053
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:906
+#: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2064
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:956
 msgid "Cut the selection"
 msgstr "بریدن انتخاب شده‌ها"
 
-#: ../src/calendar/gui/e-comp-editor.c:2050 ../src/e-util/e-focus-tracker.c:217
+#: ../src/calendar/gui/e-comp-editor.c:2129 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Delete the selection"
 msgstr "حذف انتخاب‌شده‌ها"
 
-#: ../src/calendar/gui/e-comp-editor.c:2057
+#: ../src/calendar/gui/e-comp-editor.c:2136
 msgid "View help"
 msgstr "نمایش راهنما"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
-#: ../src/e-util/e-html-editor-actions.c:983 ../src/e-util/e-text.c:2092
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:932
+#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1112 ../src/e-util/e-text.c:2077
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:982
 #, fuzzy
 #| msgid "Paste"
 msgid "_Paste"
 msgstr "چسباندن"
 
-#: ../src/calendar/gui/e-comp-editor.c:2064 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2143 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
-#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2062
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:934
+#: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2073
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:984
 msgid "Paste the clipboard"
 msgstr "چسباندن تخته‌گیره"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069 ../src/composer/e-composer-actions.c:373
-#: ../src/mail/e-mail-reader.c:2749
+#: ../src/calendar/gui/e-comp-editor.c:2148 ../src/composer/e-composer-actions.c:387
+#: ../src/mail/e-mail-reader.c:2782
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 #, fuzzy
@@ -7723,79 +7895,79 @@ msgstr "چسباندن تخته‌گیره"
 msgid "_Print…"
 msgstr "_چاپ"
 
-#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2756
+#: ../src/calendar/gui/e-comp-editor.c:2155 ../src/mail/e-mail-reader.c:2789
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1865
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1067
 #, fuzzy
 #| msgid "Preview"
 msgid "Pre_view…"
 msgstr "پیش‌نمایش"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
-#: ../src/e-util/e-html-editor-actions.c:997 ../src/e-util/e-web-view.c:486
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1002
+#: ../src/calendar/gui/e-comp-editor.c:2162 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1126 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1059
 msgid "Select _All"
 msgstr "انتخاب _همه"
 
-#: ../src/calendar/gui/e-comp-editor.c:2085 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2164 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
-#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1004
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1061
 msgid "Select all text"
 msgstr "انتخاب همهٔ متن"
 
-#: ../src/calendar/gui/e-comp-editor.c:2106
+#: ../src/calendar/gui/e-comp-editor.c:2185
 msgid "_Classification"
 msgstr "طبقه‌بندی"
 
-#: ../src/calendar/gui/e-comp-editor.c:2120
-#: ../src/e-util/e-html-editor-actions.c:1020
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:210
-#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1046
+#: ../src/calendar/gui/e-comp-editor.c:2199
+#: ../src/e-util/e-html-editor-actions.c:1149
+#: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1031 ../src/shell/e-shell-window-actions.c:1110
 msgid "_File"
 msgstr "پرونده"
 
-#: ../src/calendar/gui/e-comp-editor.c:2134
-#: ../src/e-util/e-html-editor-actions.c:1041
+#: ../src/calendar/gui/e-comp-editor.c:2213
+#: ../src/e-util/e-html-editor-actions.c:1170
 msgid "_Insert"
 msgstr "درج"
 
-#: ../src/calendar/gui/e-comp-editor.c:2141 ../src/composer/e-composer-actions.c:363
+#: ../src/calendar/gui/e-comp-editor.c:2220 ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "گزینه‌ها"
 
-#: ../src/calendar/gui/e-comp-editor.c:2148
-#: ../src/e-util/e-html-editor-actions.c:1062 ../src/mail/e-mail-browser.c:224
-#: ../src/shell/e-shell-window-actions.c:1089
-#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2227
+#: ../src/e-util/e-html-editor-actions.c:1191 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1153
+#: ../src/smime/gui/certificate-manager.c:1644 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "نما"
 
-#: ../src/calendar/gui/e-comp-editor.c:2160
+#: ../src/calendar/gui/e-comp-editor.c:2239
 msgid "Save current changes"
 msgstr "ذخیرهٔ تفییرات جاری"
 
-#: ../src/calendar/gui/e-comp-editor.c:2165
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
+#: ../src/calendar/gui/e-comp-editor.c:2244
+#: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1026
 msgid "Save and Close"
 msgstr "ذخیره و بستن"
 
-#: ../src/calendar/gui/e-comp-editor.c:2167
+#: ../src/calendar/gui/e-comp-editor.c:2246
 msgid "Save current changes and close editor"
 msgstr "ذخیرهٔ تفییرات جاری و بستن ویرایشگر"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/e-day-view.c:2146 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1761 ../src/calendar/gui/print.c:1076
 #: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
 #: ../src/calendar/gui/print.c:2683
 msgid "am"
 msgstr "صبح"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
-#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/e-day-view.c:2149 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1764 ../src/calendar/gui/print.c:1081
 #: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
 #: ../src/calendar/gui/print.c:2685
 msgid "pm"
@@ -7807,14 +7979,14 @@ msgstr "ب.ظ"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3046
-#: ../src/calendar/gui/e-day-view-top-item.c:850
-#: ../src/calendar/gui/e-week-view-main-item.c:205 ../src/calendar/gui/print.c:2117
+#: ../src/calendar/gui/e-day-view.c:3040
+#: ../src/calendar/gui/e-day-view-top-item.c:848
+#: ../src/calendar/gui/e-week-view-main-item.c:207 ../src/calendar/gui/print.c:2117
 msgid "%A %d %B"
 msgstr "%A %Od %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3787
+#: ../src/calendar/gui/e-day-view.c:3780
 #, c-format
 msgid "Week %d"
 msgstr "هفتهٔ %d"
@@ -7825,27 +7997,27 @@ msgstr "هفتهٔ %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:811
+#: ../src/calendar/gui/e-day-view-time-item.c:817
 #, c-format
 msgid "%02i minute divisions"
 msgstr "تقسیمات %02i دقیقه‌ای"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:836
+#: ../src/calendar/gui/e-day-view-time-item.c:842
 msgid "Show the second time zone"
 msgstr "نمایش منطقهٔ زمانی دوم"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:853
-#: ../src/modules/calendar/e-calendar-preferences.c:310
-#: ../src/modules/calendar/e-calendar-preferences.c:362
+#: ../src/calendar/gui/e-day-view-time-item.c:859
+#: ../src/modules/calendar/e-calendar-preferences.c:311
+#: ../src/modules/calendar/e-calendar-preferences.c:363
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
-#: ../src/modules/calendar/e-calendar-preferences.c:393
+#: ../src/modules/calendar/e-calendar-preferences.c:394
 #, fuzzy
 #| msgid "_Select"
 msgid "Select…"
@@ -7867,70 +8039,70 @@ msgstr "شرکت‌کنندگان اختیاری"
 msgid "Resources"
 msgstr "منابع"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:163
+#: ../src/calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "شرکت‌کنندگان"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:179
+#: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1261
 msgid "Individual"
 msgstr "شخص"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:180
+#: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
 #: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "گروه"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:181
+#: ../src/calendar/gui/e-meeting-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
 #: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
 msgid "Resource"
 msgstr "منبع"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:182
+#: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
 #: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
 msgid "Room"
 msgstr "اتاق"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:193
+#: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
 #: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
 msgid "Chair"
 msgstr "صندلی"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:194
+#: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
+#: ../src/calendar/gui/e-meeting-store.c:1074 ../src/calendar/gui/print.c:1279
 msgid "Required Participant"
 msgstr "شرکت کنندگان الزامی"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:195
+#: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
 #: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
 msgid "Optional Participant"
 msgstr "شرکت کنندگان اختیاری"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:196
+#: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
 #: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
 msgid "Non-Participant"
 msgstr "شرکت نمی‌کنند"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-list-view.c:204
 #: ../src/calendar/gui/e-meeting-store.c:177
 #: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:1079
+#: ../src/calendar/gui/e-meeting-store.c:1080
 msgid "Needs Action"
 msgstr "نیاز به عمل دارد"
 
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:678
+#: ../src/calendar/gui/e-meeting-list-view.c:675
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "لطفاً پاسخ دهید"
@@ -7947,20 +8119,20 @@ msgstr "انجام شد"
 msgid "In Process"
 msgstr "در حال اجرا"
 
-#: ../src/calendar/gui/e-meeting-store.c:2003
+#: ../src/calendar/gui/e-meeting-store.c:2015
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "برای دست‌رسی به اطلاعات آزاد/مشغول روی کارساز %s به عنوان کاربر %s گذرواژه را وارد "
 "کنید"
 
-#: ../src/calendar/gui/e-meeting-store.c:2013
+#: ../src/calendar/gui/e-meeting-store.c:2025
 #, c-format
 msgid "Failure reason: %s"
 msgstr "دلیل خطا: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:2018
-#: ../src/e-util/e-collection-account-wizard.c:493
+#: ../src/calendar/gui/e-meeting-store.c:2030
+#: ../src/e-util/e-collection-account-wizard.c:501
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8069,38 +8241,38 @@ msgstr "نام مصطلح"
 msgid "Language"
 msgstr "زبان"
 
-#: ../src/calendar/gui/e-memo-table.c:535 ../src/calendar/gui/e-task-table.c:700
+#: ../src/calendar/gui/e-memo-table.c:524 ../src/calendar/gui/e-task-table.c:694
 msgid "* No Summary *"
 msgstr "* بدون خلاصه *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:622 ../src/calendar/gui/e-task-table.c:801
+#: ../src/calendar/gui/e-memo-table.c:611 ../src/calendar/gui/e-task-table.c:795
 msgid "Start: "
 msgstr "آغاز: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:642 ../src/calendar/gui/e-task-table.c:834
+#: ../src/calendar/gui/e-memo-table.c:631 ../src/calendar/gui/e-task-table.c:828
 msgid "Due: "
 msgstr "سررسید: "
 
-#: ../src/calendar/gui/e-memo-table.c:850
+#: ../src/calendar/gui/e-memo-table.c:839
 msgid "Cut selected memos to the clipboard"
 msgstr "بریدن یادداشت‌های انتخاب شده و انتقال آن‌ها به تخته‌گیره"
 
-#: ../src/calendar/gui/e-memo-table.c:856
+#: ../src/calendar/gui/e-memo-table.c:845
 msgid "Copy selected memos to the clipboard"
 msgstr "رونوشت از یادداشت‌های انتخاب شده در تخته‌گیره"
 
-#: ../src/calendar/gui/e-memo-table.c:862
+#: ../src/calendar/gui/e-memo-table.c:851
 msgid "Paste memos from the clipboard"
 msgstr "چسباندن یادداشت‌ها از تخته‌گیره"
 
-#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/calendar/gui/e-memo-table.c:857
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "حذف یادداشت‌های انتخاب شده"
 
-#: ../src/calendar/gui/e-memo-table.c:874
+#: ../src/calendar/gui/e-memo-table.c:863
 msgid "Select all visible memos"
 msgstr "انتخاب همهٔ یادداشت‌های قابل مشاهده"
 
@@ -8108,7 +8280,7 @@ msgstr "انتخاب همهٔ یادداشت‌های قابل مشاهده"
 msgid "Click to add a memo"
 msgstr "برای اضافه کردن یادداشت کلیک کنید"
 
-#: ../src/calendar/gui/e-task-table.c:474 ../src/calendar/gui/tasktypes.xml.in.h:22
+#: ../src/calendar/gui/e-task-table.c:467 ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "تعریف نشده"
@@ -8117,29 +8289,29 @@ msgstr "تعریف نشده"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:502
+#: ../src/calendar/gui/e-task-table.c:496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1072
+#: ../src/calendar/gui/e-task-table.c:1066
 msgid "Cut selected tasks to the clipboard"
 msgstr "بریدن تکلیف‌های انتخاب شده و انتقال آن‌ها به تخته‌گیره"
 
-#: ../src/calendar/gui/e-task-table.c:1078
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Copy selected tasks to the clipboard"
 msgstr "رونوشت از تکلیف‌های انتخاب شده در تخته‌گیره"
 
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Paste tasks from the clipboard"
 msgstr "چسباندن تکلیف‌ها از تخته‌گیره"
 
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1084
 #: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "حذف تکلیف‌های انتخاب شده"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1090
 msgid "Select all visible tasks"
 msgstr "انتخاب همهٔ تکلیف‌های قابل مشاهده"
 
@@ -8206,87 +8378,93 @@ msgid "Completed: %s"
 msgstr "تکمیل "
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/calendar/gui/e-to-do-pane.c:1588 ../src/e-util/e-cell-date-edit.c:338
 #: ../src/e-util/e-datetime-format.c:207
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
-#: ../src/modules/itip-formatter/itip-view.c:256
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1966
+#: ../src/modules/itip-formatter/itip-view.c:261
 msgid "Today"
 msgstr "امروز"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1578 ../src/e-util/e-datetime-format.c:218
-#: ../src/modules/itip-formatter/itip-view.c:284
+#: ../src/calendar/gui/e-to-do-pane.c:1590 ../src/e-util/e-datetime-format.c:218
+#: ../src/modules/itip-formatter/itip-view.c:289
 msgid "Tomorrow"
 msgstr "فردا"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1588
+#: ../src/calendar/gui/e-to-do-pane.c:1600
 #, fuzzy
 #| msgid "With _Due Date"
 msgid "Tasks without Due date"
 msgstr "با زمان _سررسید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+#: ../src/calendar/gui/e-to-do-pane.c:2188
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1551
 #, fuzzy
 #| msgid "New Appointment"
 msgid "New _Appointment…"
 msgstr "قرار جدید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2173
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../src/calendar/gui/e-to-do-pane.c:2196
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1488
 #, fuzzy
 #| msgid "New Meeting"
 msgid "New _Meeting…"
 msgstr "جلسهٔ جدید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2181
+#: ../src/calendar/gui/e-to-do-pane.c:2204
 #, fuzzy
 #| msgid "New _Task"
 msgid "New _Task…"
 msgstr "_تکلیف جدید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2189
+#: ../src/calendar/gui/e-to-do-pane.c:2212
 #, fuzzy
 #| msgid "New assigned task"
 msgid "_New Assigned Task…"
 msgstr "تکلیف تخصیص داده شدهٔ جدید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2202
+#: ../src/calendar/gui/e-to-do-pane.c:2225
 #, fuzzy
 #| msgid "_Open"
 msgid "_Open…"
 msgstr "_باز کردن"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2216
+#: ../src/calendar/gui/e-to-do-pane.c:2239
 #, fuzzy
 #| msgid "Delete this _Occurrence"
 msgid "_Delete This Instance…"
 msgstr "حذف این _دفعه"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2224
+#: ../src/calendar/gui/e-to-do-pane.c:2248
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "Delete This and F_uture Occurrences…"
+msgstr "حذف این _دفعه"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2257
 #, fuzzy
 #| msgid "All Instances"
 msgid "D_elete All Instances…"
 msgstr "همهٔ موارد"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2232
+#: ../src/calendar/gui/e-to-do-pane.c:2265
 #, fuzzy
 #| msgid "_Delete"
 msgid "_Delete…"
 msgstr "_حذف شود"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2249
+#: ../src/calendar/gui/e-to-do-pane.c:2282
 msgid "_Show Tasks without Due date"
 msgstr "_نمایش تکلیف‌ها بدون تاریخ سررسید"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2515
+#: ../src/calendar/gui/e-to-do-pane.c:2561
 msgid "To Do"
 msgstr "رسیدگی شود"
 
 #. Translators: the first '%s' is replaced with a component summary;
 #. the second '%s' is replaced with an event location.
 #. Example: "Meet John Doe (Central Park)"
-#: ../src/calendar/gui/e-week-view.c:3705
+#: ../src/calendar/gui/e-week-view.c:3715
 #, fuzzy, c-format
 #| msgid "%s (%d items)"
 msgctxt "SummaryWithLocation"
@@ -8296,36 +8474,36 @@ msgstr "%s (%Id مورد)"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-week-view-main-item.c:222 ../src/calendar/gui/print.c:2096
+#: ../src/calendar/gui/e-week-view-main-item.c:224 ../src/calendar/gui/print.c:2096
 msgid "%d %B"
 msgstr "%Od %B"
 
-#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
-#: ../src/calendar/gui/itip-utils.c:1010
+#: ../src/calendar/gui/itip-utils.c:914 ../src/calendar/gui/itip-utils.c:980
+#: ../src/calendar/gui/itip-utils.c:1129
 msgid "An organizer must be set."
 msgstr "باید سازمان‌دهنده‌ای تنظیم شود."
 
-#: ../src/calendar/gui/itip-utils.c:851
+#: ../src/calendar/gui/itip-utils.c:970
 msgid "At least one attendee is necessary"
 msgstr "دست‌کم یک شرکت‌کننده لازم است"
 
-#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
+#: ../src/calendar/gui/itip-utils.c:1227 ../src/calendar/gui/itip-utils.c:1393
 msgid "Event information"
 msgstr "اطلاعات رویداد"
 
-#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
+#: ../src/calendar/gui/itip-utils.c:1230 ../src/calendar/gui/itip-utils.c:1396
 msgid "Task information"
 msgstr "اطلاعات تکلیف"
 
-#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
+#: ../src/calendar/gui/itip-utils.c:1233 ../src/calendar/gui/itip-utils.c:1399
 msgid "Memo information"
 msgstr "اطلاعات یادداشت"
 
-#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
+#: ../src/calendar/gui/itip-utils.c:1236 ../src/calendar/gui/itip-utils.c:1417
 msgid "Free/Busy information"
 msgstr "اطلاعات آزاد/مشغول"
 
-#: ../src/calendar/gui/itip-utils.c:1120
+#: ../src/calendar/gui/itip-utils.c:1239
 msgid "Calendar information"
 msgstr "اطلاعات تقویم"
 
@@ -8333,7 +8511,7 @@ msgstr "اطلاعات تقویم"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1160
+#: ../src/calendar/gui/itip-utils.c:1279
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "پذیرفته شده"
@@ -8342,7 +8520,7 @@ msgstr "پذیرفته شده"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1167
+#: ../src/calendar/gui/itip-utils.c:1286
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "به طور احتمالی پذیرفته شده"
@@ -8354,7 +8532,7 @@ msgstr "به طور احتمالی پذیرفته شده"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
+#: ../src/calendar/gui/itip-utils.c:1293 ../src/calendar/gui/itip-utils.c:1341
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "رد شده"
@@ -8363,7 +8541,7 @@ msgstr "رد شده"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1181
+#: ../src/calendar/gui/itip-utils.c:1300
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "واگذار شده"
@@ -8371,7 +8549,7 @@ msgstr "واگذار شده"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1194
+#: ../src/calendar/gui/itip-utils.c:1313
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "به‌روز شده"
@@ -8379,7 +8557,7 @@ msgstr "به‌روز شده"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1201
+#: ../src/calendar/gui/itip-utils.c:1320
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "انصراف"
@@ -8387,7 +8565,7 @@ msgstr "انصراف"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1208
+#: ../src/calendar/gui/itip-utils.c:1327
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "نوسازی"
@@ -8395,55 +8573,55 @@ msgstr "نوسازی"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1215
+#: ../src/calendar/gui/itip-utils.c:1334
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "پیشنهاد متقابل"
 
-#: ../src/calendar/gui/itip-utils.c:1295
+#: ../src/calendar/gui/itip-utils.c:1414
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "اطلاعات آزاد/مشغول (%s به %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1303
+#: ../src/calendar/gui/itip-utils.c:1422
 msgid "iCalendar information"
 msgstr "اطلاعات iCalendar"
 
-#: ../src/calendar/gui/itip-utils.c:1332
+#: ../src/calendar/gui/itip-utils.c:1451
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "باز کردن دفترچهٔ نشانی ممکن نیست، رویداد جدید با یکی دیگر برخورد دارد."
 
-#: ../src/calendar/gui/itip-utils.c:1337
+#: ../src/calendar/gui/itip-utils.c:1456
 #, fuzzy
 #| msgid "Unable to book a resource, error: "
 msgid "Unable to book a resource, error: "
 msgstr "باز کردن دفترچهٔ نشانی ممکن نیست، خطا:"
 
-#: ../src/calendar/gui/itip-utils.c:1530
+#: ../src/calendar/gui/itip-utils.c:1649
 msgid "You must be an attendee of the event."
 msgstr "شما باید یکی از شرکت‌کنندگان در رویداد باشید."
 
-#: ../src/calendar/gui/itip-utils.c:2312
+#: ../src/calendar/gui/itip-utils.c:2528
 #, fuzzy
 #| msgid "Signing message"
 msgid "Sending an event"
 msgstr "در حال امضا کردن پیام"
 
-#: ../src/calendar/gui/itip-utils.c:2316
+#: ../src/calendar/gui/itip-utils.c:2532
 #, fuzzy
 #| msgid "Sending mail"
 msgid "Sending a memo"
 msgstr "درحال ارسال نامه"
 
-#: ../src/calendar/gui/itip-utils.c:2320
+#: ../src/calendar/gui/itip-utils.c:2536
 #, fuzzy
 #| msgid "Sending mail"
 msgid "Sending a task"
 msgstr "درحال ارسال نامه"
 
 #. Translator: This is used as a placeholder when an event doesn't have set a location
-#: ../src/calendar/gui/itip-utils.c:2572
+#: ../src/calendar/gui/itip-utils.c:2781
 msgctxt "Location"
 msgid "Unspecified"
 msgstr "نامشخّص"
@@ -8615,11 +8793,55 @@ msgstr "بیشتر است از"
 msgid "is less than"
 msgstr "کمتر است از"
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:28
+#, fuzzy
+#| msgid "_Current View"
+msgid "Current State"
+msgstr "_نمای فعلی"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:29
+#, fuzzy
+#| msgid "Overdue:"
+msgid "is Overdue"
+msgstr "عقب افتاده"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:30
+#, fuzzy
+#| msgctxt "ECompEditorPage"
+#| msgid "Schedule"
+msgid "is Scheduled"
+msgstr "زمان‌بندی"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:31
+#, fuzzy
+#| msgid "is not Flagged"
+msgid "is not Scheduled"
+msgstr "پرچم‌دار شده با"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:32
+#, fuzzy
+#| msgid "Due "
+msgid "Due In"
+msgstr "سرسید "
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:33
+#, fuzzy
+#| msgctxt "DateFmt"
+#| msgid "Next Sat"
+msgid "Next Days"
+msgstr "شنبهٔ بعد"
+
+#: ../src/calendar/gui/tasktypes.xml.in.h:34
+#, fuzzy
+#| msgid "Previous year"
+msgid "Previous Days"
+msgstr "پارسال"
+
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
 msgstr "قرارها و جلسه‌ها"
 
-#: ../src/calendar/importers/icalendar-importer.c:327
+#: ../src/calendar/importers/icalendar-importer.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:89
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:280
@@ -8627,7 +8849,7 @@ msgstr "قرارها و جلسه‌ها"
 msgid "New Calendar"
 msgstr "تقویم جدید"
 
-#: ../src/calendar/importers/icalendar-importer.c:330
+#: ../src/calendar/importers/icalendar-importer.c:337
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:288
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
@@ -8636,199 +8858,199 @@ msgstr "تقویم جدید"
 msgid "New Task List"
 msgstr "فهرست تکلیف _جدید"
 
-#: ../src/calendar/importers/icalendar-importer.c:372
+#: ../src/calendar/importers/icalendar-importer.c:379
 #, fuzzy
 #| msgid "Create a new calendar"
 msgid "Cre_ate new calendar"
 msgstr "ایجاد یک تقویم جدید"
 
-#: ../src/calendar/importers/icalendar-importer.c:376
+#: ../src/calendar/importers/icalendar-importer.c:383
 #, fuzzy
 #| msgid "Create a new task list"
 msgid "Cre_ate new task list"
 msgstr "ایجاد یک فهرست تکلیف جدید"
 
-#: ../src/calendar/importers/icalendar-importer.c:521
-#: ../src/calendar/importers/icalendar-importer.c:971
+#: ../src/calendar/importers/icalendar-importer.c:528
+#: ../src/calendar/importers/icalendar-importer.c:981
 msgid "Opening calendar"
 msgstr "در حال باز کردن تقویم"
 
-#: ../src/calendar/importers/icalendar-importer.c:668
+#: ../src/calendar/importers/icalendar-importer.c:678
 msgid "iCalendar files (.ics)"
 msgstr "پرونده‌های iCalendar (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:669
+#: ../src/calendar/importers/icalendar-importer.c:679
 msgid "Evolution iCalendar importer"
 msgstr "واردکنندهٔ iCalendar اوولوشن"
 
-#: ../src/calendar/importers/icalendar-importer.c:764
+#: ../src/calendar/importers/icalendar-importer.c:773
 msgid "Reminder!"
 msgstr "یادآور!"
 
-#: ../src/calendar/importers/icalendar-importer.c:859
+#: ../src/calendar/importers/icalendar-importer.c:869
 msgid "vCalendar files (.vcs)"
 msgstr "پرونده‌های تقویم مجازی (.vcf)"
 
-#: ../src/calendar/importers/icalendar-importer.c:860
+#: ../src/calendar/importers/icalendar-importer.c:870
 msgid "Evolution vCalendar importer"
 msgstr "واردکنندهٔ تقویم مجازی اوولوشن"
 
-#: ../src/calendar/importers/icalendar-importer.c:1134
+#: ../src/calendar/importers/icalendar-importer.c:1144
 msgid "Calendar Events"
 msgstr "رویدادهای تقویم"
 
-#: ../src/calendar/importers/icalendar-importer.c:1177
+#: ../src/calendar/importers/icalendar-importer.c:1187
 #, fuzzy
 #| msgid "New Calendar"
 msgid "GNOME Calendar"
 msgstr "تقویم جدید"
 
-#: ../src/calendar/importers/icalendar-importer.c:1178
+#: ../src/calendar/importers/icalendar-importer.c:1188
 msgid "Evolution Calendar intelligent importer"
 msgstr "واردکنندهٔ تقویم هوشمند اوولوشن"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1609
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "جلسه"
 
-#: ../src/calendar/importers/icalendar-importer.c:1254
-#: ../src/calendar/importers/icalendar-importer.c:1582
+#: ../src/calendar/importers/icalendar-importer.c:1283
+#: ../src/calendar/importers/icalendar-importer.c:1609
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "رویداد"
 
-#: ../src/calendar/importers/icalendar-importer.c:1257
-#: ../src/calendar/importers/icalendar-importer.c:1583
+#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1610
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "تکلیف"
 
-#: ../src/calendar/importers/icalendar-importer.c:1260
-#: ../src/calendar/importers/icalendar-importer.c:1584
+#: ../src/calendar/importers/icalendar-importer.c:1289
+#: ../src/calendar/importers/icalendar-importer.c:1611
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "یادداشت"
 
+#: ../src/calendar/importers/icalendar-importer.c:1298
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "به عنوان نمونه"
+
 #. have ? NULL :
-#: ../src/calendar/importers/icalendar-importer.c:1269
+#: ../src/calendar/importers/icalendar-importer.c:1301
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "تکرار دارد"
 
-#: ../src/calendar/importers/icalendar-importer.c:1274
-msgctxt "iCalImp"
-msgid "is an instance"
-msgstr "به عنوان نمونه"
-
-#: ../src/calendar/importers/icalendar-importer.c:1279
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "یادآوری دارد"
 
-#: ../src/calendar/importers/icalendar-importer.c:1284
+#: ../src/calendar/importers/icalendar-importer.c:1311
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "پیوست دارد"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1296
+#: ../src/calendar/importers/icalendar-importer.c:1323
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "عمومی"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1299
+#: ../src/calendar/importers/icalendar-importer.c:1326
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "خصوصی"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1302
+#: ../src/calendar/importers/icalendar-importer.c:1329
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "محرمانه"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1306
+#: ../src/calendar/importers/icalendar-importer.c:1333
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "طبقه‌بندی"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1311
-#: ../src/calendar/importers/icalendar-importer.c:1627
+#: ../src/calendar/importers/icalendar-importer.c:1338
+#: ../src/calendar/importers/icalendar-importer.c:1654
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "خلاصه"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1318
+#: ../src/calendar/importers/icalendar-importer.c:1345
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "مکان"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1326
-#: ../src/calendar/importers/icalendar-importer.c:1622
+#: ../src/calendar/importers/icalendar-importer.c:1353
+#: ../src/calendar/importers/icalendar-importer.c:1649
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "شروع"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1336
+#: ../src/calendar/importers/icalendar-importer.c:1363
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "سررسید"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1347
+#: ../src/calendar/importers/icalendar-importer.c:1374
 msgctxt "iCalImp"
 msgid "End"
 msgstr "پایان"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1356
+#: ../src/calendar/importers/icalendar-importer.c:1383
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "دسته‌ها"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1381
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "انجام شده"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1388
+#: ../src/calendar/importers/icalendar-importer.c:1415
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "نشانی اینترنتی"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1405
-#: ../src/calendar/importers/icalendar-importer.c:1408
+#: ../src/calendar/importers/icalendar-importer.c:1432
+#: ../src/calendar/importers/icalendar-importer.c:1435
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "سازمان‌دهنده"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1437
-#: ../src/calendar/importers/icalendar-importer.c:1440
+#: ../src/calendar/importers/icalendar-importer.c:1464
+#: ../src/calendar/importers/icalendar-importer.c:1467
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "شرکت‌کنندگان"
 
-#: ../src/calendar/importers/icalendar-importer.c:1456
+#: ../src/calendar/importers/icalendar-importer.c:1483
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "شرح"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1617
+#: ../src/calendar/importers/icalendar-importer.c:1644
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "نوع"
@@ -10382,151 +10604,151 @@ msgstr "اقیانوس آرام/والیس"
 msgid "Pacific/Yap"
 msgstr "اقیانوس آرام/یپ"
 
-#: ../src/composer/e-composer-actions.c:226
+#: ../src/composer/e-composer-actions.c:240
 #, fuzzy
 #| msgid "Save As"
 msgid "Save as…"
 msgstr "ذخیره به نام"
 
-#: ../src/composer/e-composer-actions.c:321
+#: ../src/composer/e-composer-actions.c:335
 msgid "Close the current file"
 msgstr "بستن پروندهٔ جاری"
 
-#: ../src/composer/e-composer-actions.c:326
+#: ../src/composer/e-composer-actions.c:340
 msgid "New _Message"
 msgstr "پیام جدید"
 
-#: ../src/composer/e-composer-actions.c:328
+#: ../src/composer/e-composer-actions.c:342
 msgid "Open New Message window"
 msgstr "باز کردن پنجرهٔ پیام جدید"
 
-#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell-window-actions.c:946
+#: ../src/composer/e-composer-actions.c:347 ../src/shell/e-shell-window-actions.c:996
 #, fuzzy
 #| msgid "Prefere_nces"
 msgid "_Preferences"
 msgstr "تر_جیحات"
 
-#: ../src/composer/e-composer-actions.c:335 ../src/shell/e-shell-window-actions.c:948
+#: ../src/composer/e-composer-actions.c:349 ../src/shell/e-shell-window-actions.c:998
 msgid "Configure Evolution"
 msgstr "پیکربندی اوولوشن"
 
-#: ../src/composer/e-composer-actions.c:342
+#: ../src/composer/e-composer-actions.c:356
 msgid "Save the current file"
 msgstr "ذخیرهٔ پروندهٔ فعلی"
 
-#: ../src/composer/e-composer-actions.c:347
+#: ../src/composer/e-composer-actions.c:361
 #, fuzzy
 #| msgid "Save As"
 msgid "Save _As…"
 msgstr "ذخیره به نام"
 
-#: ../src/composer/e-composer-actions.c:349
+#: ../src/composer/e-composer-actions.c:363
 msgid "Save the current file with a different name"
 msgstr "ذخیرهٔ پروندهٔ فعلی با نامی متفاوت"
 
-#: ../src/composer/e-composer-actions.c:356
+#: ../src/composer/e-composer-actions.c:370
 msgid "Character _Encoding"
 msgstr "کدگذاری نویسه‌ها"
 
-#: ../src/composer/e-composer-actions.c:380
+#: ../src/composer/e-composer-actions.c:394
 msgid "Print Pre_view"
 msgstr "پیش‌نمای چاپ"
 
-#: ../src/composer/e-composer-actions.c:387
+#: ../src/composer/e-composer-actions.c:401
 msgid "Save as _Draft"
 msgstr "ذخیره به عنوان پیش‌نویس"
 
-#: ../src/composer/e-composer-actions.c:389
+#: ../src/composer/e-composer-actions.c:403
 msgid "Save as draft"
 msgstr "ذخیره به عنوان پیش‌نویس"
 
-#: ../src/composer/e-composer-actions.c:394
+#: ../src/composer/e-composer-actions.c:408
 msgid "S_end"
 msgstr "ارسال"
 
-#: ../src/composer/e-composer-actions.c:396
+#: ../src/composer/e-composer-actions.c:410
 msgid "Send this message"
 msgstr "ارسال این پیام"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:418
 msgid "PGP _Encrypt"
 msgstr "رمزنگاری PGP"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:420
 msgid "Encrypt this message with PGP"
 msgstr "رمزکردن این پیام با PGP"
 
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:426
 msgid "PGP _Sign"
 msgstr "امضا با PGP"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:428
 msgid "Sign this message with your PGP key"
 msgstr "امضای این پیام با کلید PGPتان"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:434
 msgid "_Picture Gallery"
 msgstr "گالری تصاویر"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:436
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "نمایش مجموعه‌ای از تصاویری که می‌توانید به پیامتان بیندازید"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:442
 msgid "_Prioritize Message"
 msgstr "اولویت‌بندی پیام"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:444
 msgid "Set the message priority to high"
 msgstr "اولویت پیام بالا تنظیم شود"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:450
 msgid "Re_quest Read Receipt"
 msgstr "درخواست رسید خواندن"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:452
 msgid "Get delivery notification when your message is read"
 msgstr "گرفتن اطلاع تحویل وقتی که پیام‌تان خوانده می‌شود"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:458
 msgid "S/MIME En_crypt"
 msgstr "رمزنگاری S/MIME"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:460
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "رمزنگاری این پیام با گواهی رمزنگاری S/MIME شما"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:466
 msgid "S/MIME Sig_n"
 msgstr "امضای S/MIME"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:468
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "امضای این پیام با گواهی امضای S/MIME شما"
 
-#: ../src/composer/e-composer-actions.c:508
+#: ../src/composer/e-composer-actions.c:522
 msgid "_Bcc Field"
 msgstr "فیلد رونوشت م_حرمانه"
 
-#: ../src/composer/e-composer-actions.c:510
+#: ../src/composer/e-composer-actions.c:524
 msgid "Toggles whether the BCC field is displayed"
 msgstr "ضامن این که فیلد رونوشت محرمانه نشان داده شود را می‌زند"
 
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:530
 msgid "_Cc Field"
 msgstr "فیلد _رونوشت"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:532
 msgid "Toggles whether the CC field is displayed"
 msgstr "ضامن این که فیلد رونوشت نشان داده شود را می‌زند"
 
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:538
 #, fuzzy
 #| msgid "_From Field"
 msgid "_From Override Field"
 msgstr "فیلد _فرستنده"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:540
 #, fuzzy
 #| msgid "Toggles whether the Role field is displayed"
 msgid ""
@@ -10534,33 +10756,33 @@ msgid ""
 "displayed"
 msgstr "ضامن این که فیلد نقش نشان داده شود را می‌زند"
 
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:546
 msgid "_Reply-To Field"
 msgstr "فیلد نشانی _برگشت"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:548
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "ضامن این که فیلد پاسخ به نشان داده شود را می‌زند"
 
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:554
 msgid "Visually _Wrap Long Lines"
 msgstr "_پیچش دیداری خط‌های طولانی"
 
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:611
 msgid "Attach"
 msgstr "پیوست کردن"
 
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:617
 msgid "Save Draft"
 msgstr "ذخیرهٔ پیش‌نویس"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:2029
-#: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2417
+#: ../src/e-util/e-collection-account-wizard.c:2058
+#: ../src/e-util/e-mail-signature-script-dialog.c:408
+#: ../src/e-util/e-webdav-browser.c:2555
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
-#: ../src/mail/e-mail-config-summary-page.c:334
+#: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_نام:"
@@ -10581,64 +10803,71 @@ msgstr ""
 "نشانی‌هایی که بدون نمایان شدن در فهرست گیرنده‌های پیام، یک رونوشت از آن را دریافت "
 "خواهند کرد وارد کنید"
 
-#: ../src/composer/e-composer-header-table.c:840
+#: ../src/composer/e-composer-header-table.c:831
 msgid "Fr_om:"
 msgstr "فرستنده:"
 
-#: ../src/composer/e-composer-header-table.c:847
+#: ../src/composer/e-composer-header-table.c:838
 msgid "_Reply-To:"
 msgstr "نشانی برگشت:"
 
-#: ../src/composer/e-composer-header-table.c:852
+#: ../src/composer/e-composer-header-table.c:843
 msgid "_To:"
 msgstr "گیرنده:"
 
-#: ../src/composer/e-composer-header-table.c:858
+#: ../src/composer/e-composer-header-table.c:849
 msgid "_Cc:"
 msgstr "رونوشت:"
 
-#: ../src/composer/e-composer-header-table.c:864
+#: ../src/composer/e-composer-header-table.c:855
 msgid "_Bcc:"
 msgstr "رونوشت محرمانه:"
 
-#: ../src/composer/e-composer-header-table.c:869
+#: ../src/composer/e-composer-header-table.c:860
 msgid "_Post To:"
 msgstr "پست به:"
 
-#: ../src/composer/e-composer-header-table.c:873
+#: ../src/composer/e-composer-header-table.c:864
 msgid "S_ubject:"
 msgstr "موضوع:"
 
-#: ../src/composer/e-composer-header-table.c:883
+#: ../src/composer/e-composer-header-table.c:874
 #: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "امضا:"
 
-#: ../src/composer/e-composer-name-header.c:237
+#: ../src/composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "برای دفترچهٔ نشانی اینجا کلیک کنید"
 
-#: ../src/composer/e-composer-post-header.c:180
+#: ../src/composer/e-composer-post-header.c:176
 msgid "Click here to select folders to post to"
 msgstr "برای انتخاب شاخه‌ها برای پست کردن به آن‌ها اینجا کلیک کنید"
 
-#: ../src/composer/e-msg-composer.c:1023
+#: ../src/composer/e-msg-composer.c:1036
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "امضای پیام صادره ممکن نیست: هیچ گواهی امضایی برای این حساب تنظیم نشده است"
 
-#: ../src/composer/e-msg-composer.c:1032
+#: ../src/composer/e-msg-composer.c:1045
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr ""
 "رمزنگاری پیام صادره ممکن نیست: هیچ گواهی رمزنگاری‌ای برای این حساب تنظیم نشده ا ست"
 
-#: ../src/composer/e-msg-composer.c:1823 ../src/composer/e-msg-composer.c:2497
+#: ../src/composer/e-msg-composer.c:1819 ../src/composer/e-msg-composer.c:2496
 msgid "Compose Message"
 msgstr "نگارش پیام"
 
-#: ../src/composer/e-msg-composer.c:4927
+#: ../src/composer/e-msg-composer.c:4467
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
+#, fuzzy
+#| msgid "Loading memos"
+msgid "Reading text content…"
+msgstr "در حال بار کردن یادداشت‌ها"
+
+#: ../src/composer/e-msg-composer.c:5277
 #, fuzzy
 #| msgid "Save attachments"
 msgid "Review attachment before sending."
@@ -10646,7 +10875,7 @@ msgid_plural "Review attachments before sending."
 msgstr[0] "ذخیرهٔ پیوست‌ها"
 msgstr[1] "ذخیرهٔ پیوست‌ها"
 
-#: ../src/composer/e-msg-composer.c:4932
+#: ../src/composer/e-msg-composer.c:5282
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any sensitive "
@@ -10657,7 +10886,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/composer/e-msg-composer.c:5065
+#: ../src/composer/e-msg-composer.c:5415
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "نگارشگر حاوی بدنهٔ پیام غیر متنی است، که قابل ویرایش نیست."
 
@@ -10829,7 +11058,7 @@ msgid "_Save to Outbox"
 msgstr "ذخیره در صندوق خروجی"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:694
+#: ../src/e-util/e-collection-account-wizard.c:710
 msgid "_Try Again"
 msgstr "تلاش مجدّد"
 
@@ -10973,7 +11202,19 @@ msgstr ""
 msgid "An error occurred while creating message composer."
 msgstr "هنگام ذخیره به شاخهٔ صندوق خروجی‌تان خطایی رخ داد."
 
-#: ../src/em-format/e-mail-formatter-attachment.c:335
+#: ../src/em-format/e-mail-formatter-attachment.c:309
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Toggle View Inline"
+msgstr "نمایش تورفتگی"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:309
+#, fuzzy
+#| msgid "Open With Default Application"
+msgid "Open in default application"
+msgstr "گشودن با برنامهٔ پیش‌گزیده"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:374
 #, fuzzy
 #| msgid "%s attachment"
 msgid "Display as attachment"
@@ -10989,7 +11230,7 @@ msgstr "پخش پیوست در پخش‌کنندهٔ صدای تعبیه‌شد
 
 #: ../src/em-format/e-mail-formatter-headers.c:109
 #: ../src/em-format/e-mail-part-headers.c:46 ../src/mail/e-mail-tag-editor.c:196
-#: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:60
+#: ../src/mail/message-list.etspec.h:5 ../src/modules/mail/em-mailer-prefs.c:71
 msgid "From"
 msgstr "فرستنده"
 
@@ -11005,7 +11246,7 @@ msgstr "موضوع"
 msgid "Remote content download had been blocked for this message."
 msgstr "بارگیری محتوای دوردست برای این پیام مسدود شد."
 
-#. Translators: This message suggests to the receipients
+#. Translators: This message suggests to the recipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
 #: ../src/em-format/e-mail-formatter-headers.c:359
@@ -11035,7 +11276,7 @@ msgstr "پیام"
 msgid "Format part as an RFC822 message"
 msgstr "قالب‌بندی پیام"
 
-#: ../src/em-format/e-mail-formatter-print.c:50 ../src/e-util/e-webdav-browser.c:2361
+#: ../src/em-format/e-mail-formatter-print.c:50 ../src/e-util/e-webdav-browser.c:2499
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -11047,21 +11288,21 @@ msgstr "نام"
 msgid "Size"
 msgstr "اندازه"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:181
+#: ../src/em-format/e-mail-formatter-quote-headers.c:184
 #: ../src/em-format/e-mail-part-headers.c:51 ../src/mail/e-mail-tag-editor.c:201
 #: ../src/mail/filtertypes.xml.in.h:16 ../src/mail/message-list.etspec.h:6
 #: ../src/mail/searchtypes.xml.in.h:17 ../src/mail/vfoldertypes.xml.in.h:17
-#: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/modules/mail/em-mailer-prefs.c:76
+#: ../src/smime/gui/certificate-manager.c:1625
 msgid "Subject"
 msgstr "موضوع"
 
 #. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-quote-headers.c:205
 #: ../src/em-format/e-mail-formatter-utils.c:360
-#: ../src/modules/mail/em-mailer-prefs.c:686
-#: ../src/modules/mail/em-mailer-prefs.c:1620
-#: ../src/modules/mail/em-mailer-prefs.c:1669
+#: ../src/modules/mail/em-mailer-prefs.c:716
+#: ../src/modules/mail/em-mailer-prefs.c:1934
+#: ../src/modules/mail/em-mailer-prefs.c:1983
 msgid "Mailer"
 msgstr "نامه‌رسان"
 
@@ -11087,15 +11328,14 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "_قالب‌بندی پیام در HTML"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:130
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1412
 #, fuzzy
 #| msgid "Plain Text Mode"
 msgid "Plain Text"
 msgstr "حالت متن ساده"
 
-#: ../src/em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../src/em-format/e-mail-formatter-quote-text-plain.c:131
 #: ../src/em-format/e-mail-formatter-text-plain.c:197
 msgid "Format part as plain text"
 msgstr ""
@@ -11259,19 +11499,19 @@ msgstr ""
 #: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48 ../src/mail/message-list.etspec.h:9
 #: ../src/mail/searchtypes.xml.in.h:11 ../src/mail/vfoldertypes.xml.in.h:11
-#: ../src/modules/mail/em-mailer-prefs.c:62
+#: ../src/modules/mail/em-mailer-prefs.c:73
 msgid "To"
 msgstr "گیرنده"
 
 #: ../src/em-format/e-mail-formatter-utils.c:213
 #: ../src/em-format/e-mail-formatter-utils.c:238
-#: ../src/em-format/e-mail-part-headers.c:49 ../src/modules/mail/em-mailer-prefs.c:63
+#: ../src/em-format/e-mail-part-headers.c:49 ../src/modules/mail/em-mailer-prefs.c:74
 msgid "Cc"
 msgstr "رونوشت"
 
 #: ../src/em-format/e-mail-formatter-utils.c:214
 #: ../src/em-format/e-mail-formatter-utils.c:239
-#: ../src/em-format/e-mail-part-headers.c:50 ../src/modules/mail/em-mailer-prefs.c:64
+#: ../src/em-format/e-mail-part-headers.c:50 ../src/modules/mail/em-mailer-prefs.c:75
 msgid "Bcc"
 msgstr "رونوشت محرمانه"
 
@@ -11316,7 +11556,7 @@ msgid "partially S/MIME encrypted"
 msgstr "رمزنگاری S/MIME"
 
 #: ../src/em-format/e-mail-formatter-utils.c:693
-#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/mail/e-mail-config-security-page.c:852
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
@@ -11399,21 +11639,21 @@ msgstr "تجزیهٔ پیام S/MIME ممکن نیست: خطای ناشناخت
 msgid "Unsupported signature format"
 msgstr "قالب امضای پشتیبانی نشده"
 
-#: ../src/em-format/e-mail-part-headers.c:47 ../src/modules/mail/em-mailer-prefs.c:61
+#: ../src/em-format/e-mail-part-headers.c:47 ../src/modules/mail/em-mailer-prefs.c:72
 msgid "Reply-To"
 msgstr "نشانی برگشت"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
-#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
-#: ../src/modules/mail/em-mailer-prefs.c:66
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:581 ../src/mail/message-list.etspec.h:7
+#: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "Date"
 msgstr "تاریخ"
 
-#: ../src/em-format/e-mail-part-headers.c:53 ../src/modules/mail/em-mailer-prefs.c:67
+#: ../src/em-format/e-mail-part-headers.c:53 ../src/modules/mail/em-mailer-prefs.c:78
 msgid "Newsgroups"
 msgstr "گروه‌های خبری"
 
-#: ../src/em-format/e-mail-part-headers.c:54 ../src/modules/mail/em-mailer-prefs.c:68
+#: ../src/em-format/e-mail-part-headers.c:54 ../src/modules/mail/em-mailer-prefs.c:79
 #: ../src/plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "صورت"
@@ -11444,7 +11684,7 @@ msgstr "مورد تقویم اوولوشن"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
 #: ../src/e-util/e-accounts-window.c:894
-#: ../src/modules/mail/e-mail-shell-backend.c:910
+#: ../src/modules/mail/e-mail-shell-backend.c:1110
 msgid "Mail Accounts"
 msgstr "حساب‌های نامه‌ای"
 
@@ -11455,7 +11695,7 @@ msgstr "دفترچهٔ نشانی"
 
 #: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
 #: ../src/e-util/e-accounts-window.c:909
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 msgid "Calendars"
 msgstr "تقویم‌ها"
 
@@ -11466,21 +11706,21 @@ msgstr "فهرست یادداشت‌ها"
 
 #: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
 #: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid "Task Lists"
 msgstr "فهرست تکلیف"
 
 #: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1306
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
-#: ../src/plugins/mail-notification/mail-notification.c:1124
-#: ../src/plugins/publish-calendar/publish-calendar.c:854
+#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:394
+#: ../src/plugins/mail-notification/mail-notification.c:1175
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
 msgid "Enabled"
 msgstr "به کار افتاده"
 
 #: ../src/e-util/e-accounts-window.c:1415 ../src/mail/e-mail-account-tree-view.c:108
-#: ../src/plugins/mail-notification/mail-notification.c:1140
+#: ../src/plugins/mail-notification/mail-notification.c:1191
 msgid "Account Name"
 msgstr "نام حساب"
 
@@ -11517,10 +11757,10 @@ msgstr "حساب‌های اوولوشن"
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
-#: ../src/mail/em-subscription-editor.c:1952
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2866
+#: ../src/mail/em-subscription-editor.c:1945
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1594
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 #, fuzzy
 #| msgid "_Refresh:"
 msgid "_Refresh"
@@ -11531,31 +11771,31 @@ msgid "Initiates refresh of account sources"
 msgstr ""
 
 #. Translators: This is a cancelled activity.
-#: ../src/e-util/e-activity.c:256
+#: ../src/e-util/e-activity.c:252
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (لغو شده)"
 
 #. Translators: This is a completed activity.
-#: ../src/e-util/e-activity.c:259
+#: ../src/e-util/e-activity.c:255
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (کامل شده)"
 
 #. Translators: This is an activity waiting to run.
-#: ../src/e-util/e-activity.c:262
+#: ../src/e-util/e-activity.c:258
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (منتظر)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../src/e-util/e-activity.c:266
+#: ../src/e-util/e-activity.c:262
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (در حال لغو)"
 
-#: ../src/e-util/e-activity.c:268
+#: ../src/e-util/e-activity.c:264
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -11563,7 +11803,7 @@ msgstr "%s"
 #. Translators: This is a running activity whose
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
-#: ../src/e-util/e-activity.c:273
+#: ../src/e-util/e-activity.c:269
 #: ../src/modules/addressbook/e-book-shell-view-private.c:334
 #: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
@@ -11571,12 +11811,12 @@ msgid "%s (%d%% complete)"
 msgstr "‏%s (‏٪%Id انجام شد)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
 msgid "Cancel"
 msgstr "انصراف"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:125
+#: ../src/e-util/e-alert-bar.c:206
 msgid "Close this message (Escape)"
 msgstr "بستن این پیام (گریز)"
 
@@ -11598,21 +11838,21 @@ msgstr "ایجاد حافظهٔ نامهٔ محلی «%s» شکست خورد: %s
 msgid "Attached message"
 msgstr "پیام پیوسته"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3130
 msgid "Operation was cancelled"
 msgstr "عملیات لغو شده بود"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2974
+#: ../src/e-util/e-attachment.c:3426 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "پیوست.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3486
 msgid "A load operation is already in progress"
 msgstr "یک عملیات بار کردن از پیش در جریان است"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3494
 msgid "A save operation is already in progress"
 msgstr "یک عملیات ذخیره از پیش در جریان است"
 
@@ -11626,46 +11866,46 @@ msgstr "امکان گشودن «%s» وجود ندارد"
 msgid "Could not open the attachment"
 msgstr "امکان گشودن پیوست وجود ندارد"
 
-#: ../src/e-util/e-attachment.c:3519
+#: ../src/e-util/e-attachment.c:3503
 #, fuzzy
 #| msgid "An attachment to add."
 msgid "Attachment contents not loaded"
 msgstr "پیوست برای اضافه کردن."
 
-#: ../src/e-util/e-attachment.c:3610
+#: ../src/e-util/e-attachment.c:3594
 #, fuzzy, c-format
 #| msgid "Could not lock '%s'"
 msgid "Could not save “%s”"
 msgstr "قفل کردن '%s' ممکن نیست"
 
-#: ../src/e-util/e-attachment.c:3613
+#: ../src/e-util/e-attachment.c:3597
 #, fuzzy, c-format
 #| msgid "Content type of the attachment."
 msgid "Could not save the attachment"
 msgstr "نوع محتویات پیوست"
 
-#: ../src/e-util/e-attachment-dialog.c:315
+#: ../src/e-util/e-attachment-dialog.c:295
 msgid "Attachment Properties"
 msgstr "ویژگی‌های پیوست"
 
-#: ../src/e-util/e-attachment-dialog.c:337 ../src/e-util/e-import-assistant.c:277
+#: ../src/e-util/e-attachment-dialog.c:317 ../src/e-util/e-import-assistant.c:303
 msgid "F_ilename:"
 msgstr "_نام پرونده:"
 
-#: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:513
-#: ../src/e-util/e-html-editor-link-dialog.c:229
-#: ../src/e-util/e-webdav-browser.c:2456
+#: ../src/e-util/e-attachment-dialog.c:334
+#: ../src/e-util/e-html-editor-image-dialog.c:602
+#: ../src/e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-webdav-browser.c:2611
 msgid "_Description:"
 msgstr "شرح:"
 
-#: ../src/e-util/e-attachment-dialog.c:372
+#: ../src/e-util/e-attachment-dialog.c:352
 #, fuzzy
 #| msgid "MIME Type"
 msgid "MIME Type:"
 msgstr "نوع MIME"
 
-#: ../src/e-util/e-attachment-dialog.c:380 ../src/e-util/e-attachment-store.c:700
+#: ../src/e-util/e-attachment-dialog.c:360 ../src/e-util/e-attachment-store.c:700
 #, fuzzy
 #| msgid "Suggest automatic display of attachment"
 msgid "_Suggest automatic display of attachment"
@@ -11697,7 +11937,7 @@ msgstr "درحال ذخیره"
 msgid "Hide Attachment _Bar"
 msgstr "_نوار پیوست مخفی شود"
 
-#: ../src/e-util/e-attachment-paned.c:105 ../src/e-util/e-attachment-paned.c:741
+#: ../src/e-util/e-attachment-paned.c:105 ../src/e-util/e-attachment-paned.c:706
 msgid "Show Attachment _Bar"
 msgstr "_نوار پیوست نمایش داده شود"
 
@@ -11747,9 +11987,9 @@ msgid "Sa_ve As"
 msgstr "ذخیره به _عنوان"
 
 #: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:348
-#: ../src/plugins/save-calendar/save-calendar.c:387
-#: ../src/plugins/save-calendar/save-calendar.c:426
+#: ../src/plugins/save-calendar/save-calendar.c:345
+#: ../src/plugins/save-calendar/save-calendar.c:384
+#: ../src/plugins/save-calendar/save-calendar.c:423
 msgid "Save _As"
 msgstr "ذخیره _به عنوان"
 
@@ -11761,59 +12001,52 @@ msgstr "پیوست"
 
 #: ../src/e-util/e-attachment-view.c:348
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1587
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Properties"
 msgstr "_ویژگی‌ها"
 
-#: ../src/e-util/e-attachment-view.c:786
+#: ../src/e-util/e-attachment-view.c:784
 #, fuzzy, c-format
 #| msgid "Open in %s..."
 msgid "Open With “%s”"
 msgstr "باز کردن در %s..."
 
-#: ../src/e-util/e-attachment-view.c:787
+#: ../src/e-util/e-attachment-view.c:785
 #, fuzzy, c-format
 #| msgid "Save attachments"
 msgid "Open this attachment in %s"
 msgstr "ذخیرهٔ پیوست‌ها"
 
-#: ../src/e-util/e-attachment-view.c:789
+#: ../src/e-util/e-attachment-view.c:787
 msgid "Open With Default Application"
 msgstr "گشودن با برنامهٔ پیش‌گزیده"
 
-#: ../src/e-util/e-attachment-view.c:790
+#: ../src/e-util/e-attachment-view.c:788
 #, fuzzy
 #| msgid "Save attachments"
 msgid "Open this attachment in default application"
 msgstr "ذخیرهٔ پیوست‌ها"
 
-#: ../src/e-util/e-book-source-config.c:98
+#: ../src/e-util/e-book-source-config.c:90
 #, fuzzy
 #| msgid "Error loading default addressbook."
 msgid "Mark as default address book"
 msgstr "خطا در بار کردن دفترچهٔ نشانی پیش‌گزیده"
 
-#: ../src/e-util/e-book-source-config.c:103
+#: ../src/e-util/e-book-source-config.c:95
 #, fuzzy
 #| msgid "Click here for the address book"
 msgid "Autocomplete with this address book"
 msgstr "برای دفترچهٔ نشانی اینجا کلیک کنید"
 
-#: ../src/e-util/e-book-source-config.c:277
+#: ../src/e-util/e-book-source-config.c:269
 msgid "Copy book content locally for offline operation"
 msgstr "رونوشت محلّی از محتویات دفترچه برای عملیات برون‌خط"
 
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../src/e-util/e-buffer-tagger.c:410
-#, fuzzy
-#| msgid "Click to open %s"
-msgid "Ctrl-click to open a link"
-msgstr "برای باز کردن %s کلیک کنید"
-
 #: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "ماه پیش"
@@ -11835,54 +12068,54 @@ msgid "Month Calendar"
 msgstr "تقویم ماه"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
+#: ../src/e-util/e-calendar-item.c:1368 ../src/e-util/e-calendar-item.c:2261
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%OB"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1359
+#: ../src/e-util/e-calendar-item.c:1370
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%OY"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1396
+#: ../src/e-util/e-calendar-item.c:1407
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %OY"
 
-#: ../src/e-util/e-cal-source-config.c:169
+#: ../src/e-util/e-cal-source-config.c:161
 #, fuzzy
 #| msgid "Mark  as default folder"
 msgid "Mark as default calendar"
 msgstr "به عنوان شاخهٔ پیش‌گزیده علامت‌گذاری شود؟"
 
-#: ../src/e-util/e-cal-source-config.c:172
+#: ../src/e-util/e-cal-source-config.c:164
 #, fuzzy
 #| msgid "Mark  as default folder"
 msgid "Mark as default task list"
 msgstr "به عنوان شاخهٔ پیش‌گزیده علامت‌گذاری شود؟"
 
-#: ../src/e-util/e-cal-source-config.c:175
+#: ../src/e-util/e-cal-source-config.c:167
 #, fuzzy
 #| msgid "Mark  as default folder"
 msgid "Mark as default memo list"
 msgstr "به عنوان شاخهٔ پیش‌گزیده علامت‌گذاری شود؟"
 
-#: ../src/e-util/e-cal-source-config.c:200
+#: ../src/e-util/e-cal-source-config.c:192
 msgid "Color:"
 msgstr "رنگ:"
 
-#: ../src/e-util/e-cal-source-config.c:428
+#: ../src/e-util/e-cal-source-config.c:420
 msgid "Copy calendar contents locally for offline operation"
 msgstr "رونوشت محلی از محتویات تقویم برای عملیات برون‌خط"
 
-#: ../src/e-util/e-cal-source-config.c:432
+#: ../src/e-util/e-cal-source-config.c:424
 msgid "Copy task list contents locally for offline operation"
 msgstr "رونوشت محلی از محتویات فهرست تکلیف برای عملیات برون‌خط"
 
-#: ../src/e-util/e-cal-source-config.c:436
+#: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy memo list contents locally for offline operation"
 msgstr "رونوشت محلی از محتویات فهرست یادداشت برای عملیات برون‌خط"
 
@@ -11909,7 +12142,7 @@ msgctxt "category"
 msgid "_Delete"
 msgstr "_حذف"
 
-#: ../src/e-util/e-categories-selector.c:323
+#: ../src/e-util/e-categories-selector.c:319
 msgid "Icon"
 msgstr "نقشک"
 
@@ -11953,31 +12186,31 @@ msgid ""
 "There is already a category “%s” in the configuration. Please use another name"
 msgstr ""
 
-#: ../src/e-util/e-cell-combo.c:183
+#: ../src/e-util/e-cell-combo.c:186
 msgid "popup list"
 msgstr "فهرست واشو"
 
-#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
+#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2181
 msgid "?"
 msgstr "؟"
 
-#: ../src/e-util/e-cell-date-edit.c:320
+#: ../src/e-util/e-cell-date-edit.c:330
 msgid "Now"
 msgstr "اکنون"
 
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../src/e-util/e-cell-date-edit.c:338
+#: ../src/e-util/e-cell-date-edit.c:348
 msgctxt "table-date"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/e-util/e-cell-date-edit.c:346 ../src/mail/e-mail-label-dialog.c:198
+#: ../src/e-util/e-cell-date-edit.c:356 ../src/mail/e-mail-label-dialog.c:190
 msgid "OK"
 msgstr "تأیید"
 
-#: ../src/e-util/e-cell-date-edit.c:901
+#: ../src/e-util/e-cell-date-edit.c:908
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "زمان باید در این قالب باشد: %s"
@@ -12072,17 +12305,44 @@ msgstr "کدگذاری نویسه‌ها"
 msgid "Enter the character set to use"
 msgstr "وارد کردن مجموعه‌نویسهٔ مورد استفاده"
 
-#: ../src/e-util/e-charset-combo-box.c:364
+#: ../src/e-util/e-charset-combo-box.c:356
 #, fuzzy
 #| msgid "Other"
 msgid "Other…"
 msgstr "دیگر"
 
-#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
+#: ../src/e-util/e-client-cache.c:1146 ../src/e-util/e-client-cache.c:1277
 #, c-format
 msgid "Cannot create a client object from extension name “%s”"
 msgstr ""
 
+#: ../src/e-util/e-client-selector.c:190 ../src/mail/em-folder-tree.c:1035
+#, fuzzy
+#| msgid "Work Offline"
+msgctxt "Status"
+msgid "Offline"
+msgstr "کار برون‌خط"
+
+#: ../src/e-util/e-client-selector.c:193 ../src/mail/em-folder-tree.c:1038
+#, fuzzy
+#| msgctxt "ReplyForward"
+#| msgid "Inline"
+msgctxt "Status"
+msgid "Online"
+msgstr "درون‌خط"
+
+#: ../src/e-util/e-client-selector.c:196 ../src/mail/em-folder-tree.c:1041
+msgctxt "Status"
+msgid "Unreachable"
+msgstr ""
+
+#: ../src/e-util/e-client-selector.c:199 ../src/mail/em-folder-tree.c:1044
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgctxt "Status"
+msgid "Failed to connect"
+msgstr "ناتوان در حذف آشنا"
+
 #: ../src/e-util/e-collection-account-wizard.c:107
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:83
 msgid "_Finish"
@@ -12093,7 +12353,7 @@ msgid "_Look Up"
 msgstr "_گشتن"
 
 #: ../src/e-util/e-collection-account-wizard.c:112
-#: ../src/e-util/e-collection-account-wizard.c:273 ../src/e-util/e-search-bar.c:680
+#: ../src/e-util/e-collection-account-wizard.c:275 ../src/e-util/e-search-bar.c:653
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:85
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:244
 msgid "_Next"
@@ -12103,126 +12363,138 @@ msgstr "_بعدی"
 msgid "New Collection Account"
 msgstr "حساب مجموعهٔ جدید"
 
-#: ../src/e-util/e-collection-account-wizard.c:258 ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-collection-account-wizard.c:260 ../src/e-util/e-search-bar.c:641
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:78
 msgid "_Previous"
 msgstr "_پیشین"
 
-#: ../src/e-util/e-collection-account-wizard.c:439
+#: ../src/e-util/e-collection-account-wizard.c:447
 msgid "Looking up details, please wait…"
 msgstr "در حال گشتن به دنبال جزییات. لطفاً شکیبایی کنید…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:496
+#: ../src/e-util/e-collection-account-wizard.c:511
 #, fuzzy, c-format
 #| msgid "Enter password for %s (user %s)"
 msgid "Requires password to continue. %s."
 msgstr "گذرواژهٔ %s (کاربر %s) را وارد کنید"
 
-#: ../src/e-util/e-collection-account-wizard.c:509
+#: ../src/e-util/e-collection-account-wizard.c:525
 msgid "View certificate"
 msgstr "دیدن گواهینامه"
 
-#: ../src/e-util/e-collection-account-wizard.c:550
+#: ../src/e-util/e-collection-account-wizard.c:566
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter the "
 "account manually instead or change above settings."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:552
+#: ../src/e-util/e-collection-account-wizard.c:568
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
 msgstr[0] "نامزدی پیدا شد"
 msgstr[1] "%Id نامزد پیدا شد"
 
-#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/e-util/e-collection-account-wizard.c:679
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "نام _کاربر:"
 
-#: ../src/e-util/e-collection-account-wizard.c:675
+#: ../src/e-util/e-collection-account-wizard.c:691
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:766
+#: ../src/smime/gui/certificate-manager.c:764
 msgid "_Password:"
 msgstr "کلمهٔ _عبور:"
 
-#: ../src/e-util/e-collection-account-wizard.c:688
+#: ../src/e-util/e-collection-account-wizard.c:704
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "به _خاطر سپردن گذرواژه"
 
-#: ../src/e-util/e-collection-account-wizard.c:835
-#: ../src/e-util/e-webdav-browser.c:474
+#: ../src/e-util/e-collection-account-wizard.c:851
+#: ../src/e-util/e-webdav-browser.c:536
 msgid "Collection"
 msgstr "مجموعه"
 
-#: ../src/e-util/e-collection-account-wizard.c:836
+#: ../src/e-util/e-collection-account-wizard.c:852
 msgid "Mail Receive"
 msgstr "گرفتن نامه"
 
-#: ../src/e-util/e-collection-account-wizard.c:837
+#: ../src/e-util/e-collection-account-wizard.c:853
 msgid "Mail Send"
 msgstr "فرستان نامه"
 
-#: ../src/e-util/e-collection-account-wizard.c:838
+#: ../src/e-util/e-collection-account-wizard.c:854
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "دفترچهٔ نشانی"
 
-#: ../src/e-util/e-collection-account-wizard.c:840
+#: ../src/e-util/e-collection-account-wizard.c:856
 msgid "Memo List"
 msgstr "فهرست یادداشت"
 
-#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/e-util/e-collection-account-wizard.c:857
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Task List"
 msgstr "فهرست تکلیف"
 
-#: ../src/e-util/e-collection-account-wizard.c:1177
+#: ../src/e-util/e-collection-account-wizard.c:1193
 msgid "Looking up LDAP server’s search base…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1484
+#: ../src/e-util/e-collection-account-wizard.c:1326
+#, fuzzy
+#| msgid "Failed to create local mail storage `%s': %s"
+msgid "Failed to store password: "
+msgstr "ایجاد حافظهٔ نامهٔ محلی «%s» شکست خورد: %s"
+
+#: ../src/e-util/e-collection-account-wizard.c:1336
+#, fuzzy
+#| msgid "Failed to create local mail storage `%s': %s"
+msgid "Failed to create sources: "
+msgstr "ایجاد حافظهٔ نامهٔ محلی «%s» شکست خورد: %s"
+
+#: ../src/e-util/e-collection-account-wizard.c:1503
 msgid "Saving account settings, please wait…"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1635
+#: ../src/e-util/e-collection-account-wizard.c:1655
 #, fuzzy
 #| msgid "Personal details:"
 msgid "User details"
 msgstr "جزئیات شخصی:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1648
+#: ../src/e-util/e-collection-account-wizard.c:1668
 msgid "_Email Address or User name:"
 msgstr "_نشانی رایانامه یا نام کاربری:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1679
+#: ../src/e-util/e-collection-account-wizard.c:1699
 msgid "_Advanced Options"
 msgstr "گزینه‌های _پبش‌رفته"
 
-#: ../src/e-util/e-collection-account-wizard.c:1684
+#: ../src/e-util/e-collection-account-wizard.c:1704
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_کارساز:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1703
+#: ../src/e-util/e-collection-account-wizard.c:1723
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in addition "
 "to the domain of the e-mail address."
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:1896
+#: ../src/e-util/e-collection-account-wizard.c:1925
 msgid "Select which parts should be configured:"
 msgstr ""
 
-#: ../src/e-util/e-collection-account-wizard.c:2020
+#: ../src/e-util/e-collection-account-wizard.c:2049
 #: ../src/mail/e-mail-config-identity-page.c:542
-#: ../src/mail/e-mail-config-summary-page.c:325
+#: ../src/mail/e-mail-config-summary-page.c:318
 msgid "Account Information"
 msgstr "اطّلاعات حساب"
 
@@ -12230,170 +12502,171 @@ msgstr "اطّلاعات حساب"
 msgid "Choose custom color"
 msgstr "گزینش رنگ سفارشی"
 
-#: ../src/e-util/e-color-combo.c:488 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:544
-#: ../src/mail/e-mail-config-security-page.c:708 ../src/mail/e-mail-reader.c:4870
+#: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:128
+#: ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:540
+#: ../src/mail/e-mail-config-security-page.c:704 ../src/mail/e-mail-reader.c:4927
 #: ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "پیش‌گزیده"
 
-#: ../src/e-util/e-color-combo.c:576
+#: ../src/e-util/e-color-combo.c:564
 msgid "black"
 msgstr "سیاه"
 
-#: ../src/e-util/e-color-combo.c:577
+#: ../src/e-util/e-color-combo.c:565
 msgid "light brown"
 msgstr "قهوه‌ای روشن"
 
-#: ../src/e-util/e-color-combo.c:578
+#: ../src/e-util/e-color-combo.c:566
 msgid "brown gold"
 msgstr "طلایی قهوه‌ای"
 
-#: ../src/e-util/e-color-combo.c:579
+#: ../src/e-util/e-color-combo.c:567
 msgid "dark green #2"
 msgstr "سبز تیرهٔ ۲"
 
-#: ../src/e-util/e-color-combo.c:580
+#: ../src/e-util/e-color-combo.c:568
 msgid "navy"
 msgstr ""
 
-#: ../src/e-util/e-color-combo.c:581
+#: ../src/e-util/e-color-combo.c:569
 msgid "dark blue"
 msgstr "آبی تیره"
 
-#: ../src/e-util/e-color-combo.c:582
+#: ../src/e-util/e-color-combo.c:570
 msgid "purple #2"
 msgstr "بنفش ۲"
 
-#: ../src/e-util/e-color-combo.c:583
+#: ../src/e-util/e-color-combo.c:571
 msgid "very dark gray"
 msgstr "خاکستری خیلی تیره"
 
-#: ../src/e-util/e-color-combo.c:585
+#: ../src/e-util/e-color-combo.c:573
 msgid "dark red"
 msgstr "قرمز تیره"
 
-#: ../src/e-util/e-color-combo.c:586
+#: ../src/e-util/e-color-combo.c:574
 msgid "red-orange"
 msgstr "قرمز-نارنجی"
 
-#: ../src/e-util/e-color-combo.c:587
+#: ../src/e-util/e-color-combo.c:575
 msgid "gold"
 msgstr "طلایی"
 
-#: ../src/e-util/e-color-combo.c:588
+#: ../src/e-util/e-color-combo.c:576
 msgid "dark green"
 msgstr "سبز تیره"
 
-#: ../src/e-util/e-color-combo.c:589
+#: ../src/e-util/e-color-combo.c:577
 msgid "dull blue"
 msgstr "آبی کدر"
 
-#: ../src/e-util/e-color-combo.c:590
+#: ../src/e-util/e-color-combo.c:578
 msgid "blue"
 msgstr "آبی"
 
-#: ../src/e-util/e-color-combo.c:591
+#: ../src/e-util/e-color-combo.c:579
 msgid "dull purple"
 msgstr "بنفش کدر"
 
-#: ../src/e-util/e-color-combo.c:592
+#: ../src/e-util/e-color-combo.c:580
 msgid "dark grey"
 msgstr "خاکستری تیره"
 
-#: ../src/e-util/e-color-combo.c:594
+#: ../src/e-util/e-color-combo.c:582
 msgid "red"
 msgstr "قرمز"
 
-#: ../src/e-util/e-color-combo.c:595
+#: ../src/e-util/e-color-combo.c:583
 msgid "orange"
 msgstr "نارنجی"
 
-#: ../src/e-util/e-color-combo.c:596
+#: ../src/e-util/e-color-combo.c:584
 msgid "lime"
 msgstr "لیمویی"
 
-#: ../src/e-util/e-color-combo.c:597
+#: ../src/e-util/e-color-combo.c:585
 msgid "dull green"
 msgstr "سبز کدر"
 
-#: ../src/e-util/e-color-combo.c:598
+#: ../src/e-util/e-color-combo.c:586
 msgid "dull blue #2"
 msgstr "آبی تیرهٔ ۲"
 
-#: ../src/e-util/e-color-combo.c:599
+#: ../src/e-util/e-color-combo.c:587
 msgid "sky blue #2"
 msgstr "آبی آسمانی ۲"
 
-#: ../src/e-util/e-color-combo.c:600
+#: ../src/e-util/e-color-combo.c:588
 msgid "purple"
 msgstr "بنفش"
 
-#: ../src/e-util/e-color-combo.c:601
+#: ../src/e-util/e-color-combo.c:589
 msgid "gray"
 msgstr "خاکستری"
 
-#: ../src/e-util/e-color-combo.c:603
+#: ../src/e-util/e-color-combo.c:591
 msgid "magenta"
 msgstr "سرخ"
 
-#: ../src/e-util/e-color-combo.c:604
+#: ../src/e-util/e-color-combo.c:592
 msgid "bright orange"
 msgstr "نارنجی روشن"
 
-#: ../src/e-util/e-color-combo.c:605
+#: ../src/e-util/e-color-combo.c:593
 msgid "yellow"
 msgstr "زرد"
 
-#: ../src/e-util/e-color-combo.c:606
+#: ../src/e-util/e-color-combo.c:594
 msgid "green"
 msgstr "سبز"
 
-#: ../src/e-util/e-color-combo.c:607
+#: ../src/e-util/e-color-combo.c:595
 msgid "cyan"
 msgstr "فیروزه‌ای"
 
-#: ../src/e-util/e-color-combo.c:608
+#: ../src/e-util/e-color-combo.c:596
 msgid "bright blue"
 msgstr "آبی روشن"
 
-#: ../src/e-util/e-color-combo.c:609
+#: ../src/e-util/e-color-combo.c:597
 msgid "red purple"
 msgstr "بنفش قرمز"
 
-#: ../src/e-util/e-color-combo.c:610
+#: ../src/e-util/e-color-combo.c:598
 msgid "light grey"
 msgstr "خاکستری روشن"
 
-#: ../src/e-util/e-color-combo.c:612
+#: ../src/e-util/e-color-combo.c:600
 msgid "pink"
 msgstr "صورتی"
 
-#: ../src/e-util/e-color-combo.c:613
+#: ../src/e-util/e-color-combo.c:601
 msgid "light orange"
 msgstr "نارنجی روشن"
 
-#: ../src/e-util/e-color-combo.c:614
+#: ../src/e-util/e-color-combo.c:602
 msgid "light yellow"
 msgstr "زرد روشن"
 
-#: ../src/e-util/e-color-combo.c:615
+#: ../src/e-util/e-color-combo.c:603
 msgid "light green"
 msgstr "سبز روشن"
 
-#: ../src/e-util/e-color-combo.c:616
+#: ../src/e-util/e-color-combo.c:604
 msgid "light cyan"
 msgstr "فیروزه‌ای روشن"
 
-#: ../src/e-util/e-color-combo.c:617
+#: ../src/e-util/e-color-combo.c:605
 msgid "light blue"
 msgstr "آبی روشن"
 
-#: ../src/e-util/e-color-combo.c:618
+#: ../src/e-util/e-color-combo.c:606
 msgid "light purple"
 msgstr "بنفش روشن"
 
-#: ../src/e-util/e-color-combo.c:619
+#: ../src/e-util/e-color-combo.c:607
 msgid "white"
 msgstr "سفید"
 
@@ -12401,53 +12674,53 @@ msgstr "سفید"
 msgid "Running…"
 msgstr "در حال اجرا…"
 
-#: ../src/e-util/e-dateedit.c:526
+#: ../src/e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "تاریخ و زمان"
 
-#: ../src/e-util/e-dateedit.c:558
+#: ../src/e-util/e-dateedit.c:557
 msgid "Text entry to input date"
 msgstr "مدخل متنی برای وارد کردن تاریخ"
 
-#: ../src/e-util/e-dateedit.c:581
+#: ../src/e-util/e-dateedit.c:580
 msgid "Click this button to show a calendar"
 msgstr "برای نمایش تقویم روی این دکمه کلیک کنید"
 
-#: ../src/e-util/e-dateedit.c:636
+#: ../src/e-util/e-dateedit.c:640
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../src/e-util/e-dateedit.c:637
+#: ../src/e-util/e-dateedit.c:641
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "مدت"
 
-#: ../src/e-util/e-dateedit.c:714
+#: ../src/e-util/e-dateedit.c:718
 msgid "No_w"
 msgstr "_اکنون"
 
-#: ../src/e-util/e-dateedit.c:721
+#: ../src/e-util/e-dateedit.c:725
 msgid "_Today"
 msgstr "_امروز"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:730 ../src/mail/em-folder-selector.c:334
+#: ../src/e-util/e-dateedit.c:734 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "_هیچ‌کدام"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
+#: ../src/e-util/e-dateedit.c:1893 ../src/e-util/e-dateedit.c:2146
 msgctxt "date"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
+#: ../src/e-util/e-dateedit.c:2029 ../src/e-util/e-dateedit.c:2500
 msgid "Invalid Date Value"
 msgstr "مقدار تاریخ نامعتبر"
 
-#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
+#: ../src/e-util/e-dateedit.c:2069 ../src/e-util/e-dateedit.c:2557
 msgid "Invalid Time Value"
 msgstr "مقدار زمان نامعتبر"
 
@@ -12511,8 +12784,8 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "یک‌شنبهٔ بعد"
 
-#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
-#: ../src/e-util/e-datetime-format.c:386
+#: ../src/e-util/e-datetime-format.c:368 ../src/e-util/e-datetime-format.c:378
+#: ../src/e-util/e-datetime-format.c:387
 #, fuzzy
 #| msgid "Use _Default"
 msgid "Use locale default"
@@ -12810,29 +13083,29 @@ msgstr "زمانی برای مقایسه انتخاب کنید"
 msgid "Choose a File"
 msgstr "گزینش یک پرونده"
 
-#: ../src/e-util/e-filter-rule.c:979
+#: ../src/e-util/e-filter-rule.c:1008
 msgid "R_ule name:"
 msgstr "نام _قاعده:"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1064
 #, fuzzy
 #| msgid "Please select among the following options"
 msgid "all the following conditions"
 msgstr "لطفاً از گزینه‌های زیر انتخاب کنید"
 
-#: ../src/e-util/e-filter-rule.c:1036
+#: ../src/e-util/e-filter-rule.c:1065
 #, fuzzy
 #| msgid "Please select among the following options"
 msgid "any of the following conditions"
 msgstr "لطفاً از گزینه‌های زیر انتخاب کنید"
 
-#: ../src/e-util/e-filter-rule.c:1042
+#: ../src/e-util/e-filter-rule.c:1071
 #, fuzzy
 #| msgid "Find items:"
 msgid "_Find items which match:"
 msgstr "پیدا کردن موارد:"
 
-#: ../src/e-util/e-filter-rule.c:1065
+#: ../src/e-util/e-filter-rule.c:1094
 #, fuzzy
 #| msgid "Please select among the following options"
 msgid "Find items that meet the following conditions"
@@ -12842,47 +13115,47 @@ msgstr "لطفاً از گزینه‌های زیر انتخاب کنید"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1080 ../src/e-util/e-html-editor-page-dialog.c:59
-#: ../src/e-util/e-mail-identity-combo-box.c:694
+#: ../src/e-util/e-filter-rule.c:1109 ../src/e-util/e-html-editor-page-dialog.c:62
+#: ../src/e-util/e-mail-identity-combo-box.c:798
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29 ../src/mail/e-mail-autoconfig.c:778
 #: ../src/mail/e-mail-config-summary-page.c:143
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:681
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/e-util/e-filter-rule.c:1081
+#: ../src/e-util/e-filter-rule.c:1110
 msgid "All related"
 msgstr "همهٔ مربوط‌ها"
 
-#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1111 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "پاسخ‌ها"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1112
 msgid "Replies and parents"
 msgstr "پاسخ‌ها و والدها"
 
-#: ../src/e-util/e-filter-rule.c:1084
+#: ../src/e-util/e-filter-rule.c:1113
 msgid "No reply or parent"
 msgstr "بدون پاسخ یا والد"
 
-#: ../src/e-util/e-filter-rule.c:1087
+#: ../src/e-util/e-filter-rule.c:1116
 #, fuzzy
 #| msgid "Include threads"
 msgid "I_nclude threads:"
 msgstr "حاوی رشته‌ها باشد"
 
-#: ../src/e-util/e-filter-rule.c:1165
+#: ../src/e-util/e-filter-rule.c:1194
 msgid "A_dd Condition"
 msgstr "_افزودن شرط"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1514 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:981 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "وارده"
 
-#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1043
+#: ../src/e-util/e-filter-rule.c:1514 ../src/mail/em-filter-rule.c:982
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "صادره"
@@ -12890,59 +13163,85 @@ msgstr "صادره"
 #: ../src/e-util/e-gtkemojichooser.c:753
 #, fuzzy
 #| msgid "Receiving"
+msgctxt "EmojiChooser"
 msgid "Recent"
 msgstr "درحال دریافت"
 
 #: ../src/e-util/e-gtkemojichooser.c:757
+#, fuzzy
+#| msgid "Smileys & People"
+msgctxt "EmojiChooser"
 msgid "Smileys & People"
 msgstr "شکلک‌ها و افراد"
 
 #: ../src/e-util/e-gtkemojichooser.c:758
 #, fuzzy
 #| msgid "Body contains"
+msgctxt "EmojiChooser"
 msgid "Body & Clothing"
 msgstr "بدنه حاوی"
 
 #: ../src/e-util/e-gtkemojichooser.c:759
+#, fuzzy
+#| msgid "Animals & Nature"
+msgctxt "EmojiChooser"
 msgid "Animals & Nature"
 msgstr "حیوانات و طبعیت"
 
 #: ../src/e-util/e-gtkemojichooser.c:760
+#, fuzzy
+#| msgid "Food & Drink"
+msgctxt "EmojiChooser"
 msgid "Food & Drink"
 msgstr "غذا و نوشیدنی"
 
 #: ../src/e-util/e-gtkemojichooser.c:761
+#, fuzzy
+#| msgid "Travel & Places"
+msgctxt "EmojiChooser"
 msgid "Travel & Places"
 msgstr "سفر و مکان‌ها"
 
 #: ../src/e-util/e-gtkemojichooser.c:762
 #, fuzzy
 #| msgid "Authorities"
+msgctxt "EmojiChooser"
 msgid "Activities"
 msgstr "مراجع صدور"
 
 #: ../src/e-util/e-gtkemojichooser.c:763
-msgctxt "emoji category"
+#, fuzzy
+#| msgctxt "emoji category"
+#| msgid "Objects"
+msgctxt "EmojiChooser"
 msgid "Objects"
 msgstr "اشیاء"
 
 #: ../src/e-util/e-gtkemojichooser.c:764
+#, fuzzy
+#| msgid "Symbols"
+msgctxt "EmojiChooser"
 msgid "Symbols"
 msgstr "نمادها"
 
-#: ../src/e-util/e-gtkemojichooser.c:765 ../src/e-util/evolution-source-viewer.c:677
+#: ../src/e-util/e-gtkemojichooser.c:765
 #, fuzzy
 #| msgid "_Flag:"
+msgctxt "EmojiChooser"
 msgid "Flags"
 msgstr "پرچم_:"
 
 #: ../src/e-util/e-gtkemojichooser.c:789
+#, fuzzy
+#| msgid "No Results Found"
+msgctxt "EmojiChooser"
 msgid "No Results Found"
 msgstr "هیچ نتیجه‌ای پیدا نشد"
 
 #: ../src/e-util/e-gtkemojichooser.c:797
 #, fuzzy
 #| msgid "Try again with a different password."
+msgctxt "EmojiChooser"
 msgid "Try a different search"
 msgstr "یک گذرواژهٔ دیگر را امتحان کنید."
 
@@ -12958,541 +13257,609 @@ msgstr "باز کردن دفترچه شکست خورد"
 msgid "Failed to insert text file."
 msgstr "تأیید هویت شکست خورد.\n"
 
-#: ../src/e-util/e-html-editor-actions.c:340
+#: ../src/e-util/e-html-editor-actions.c:360
 #, fuzzy
 #| msgid "Input File"
 msgid "Insert HTML File"
 msgstr "پروندهٔ ورودی"
 
-#: ../src/e-util/e-html-editor-actions.c:345
+#: ../src/e-util/e-html-editor-actions.c:365
 #, fuzzy
 #| msgid "HTML Mode"
 msgid "HTML file"
 msgstr "حالت HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:383
-#: ../src/e-util/e-html-editor-actions.c:401
+#: ../src/e-util/e-html-editor-actions.c:403
+#: ../src/e-util/e-html-editor-actions.c:421
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "درج تصویر"
 
-#: ../src/e-util/e-html-editor-actions.c:390
-#: ../src/e-util/e-html-editor-actions.c:408
+#: ../src/e-util/e-html-editor-actions.c:410
+#: ../src/e-util/e-html-editor-actions.c:428
 #: ../src/e-util/e-image-chooser-dialog.c:188 ../src/plugins/face/face.c:301
 #, fuzzy
 #| msgid "Import a _single file"
 msgid "Image files"
 msgstr "وارد کردن یک _تک پرونده"
 
-#: ../src/e-util/e-html-editor-actions.c:487
+#: ../src/e-util/e-html-editor-actions.c:507
 #, fuzzy
 #| msgid "Increase the text size"
 msgid "Insert text file"
 msgstr "افزایش اندازهٔ متن"
 
-#: ../src/e-util/e-html-editor-actions.c:492
+#: ../src/e-util/e-html-editor-actions.c:512
 msgid "Text file"
 msgstr "پروندهٔ متنی"
 
-#: ../src/e-util/e-html-editor-actions.c:971
+#: ../src/e-util/e-html-editor-actions.c:1100
 #, fuzzy
 #| msgid "Copy selected events to the clipboard"
 msgid "Copy selected text to the clipboard"
 msgstr "رونوشت از رویدادهای انتخاب شده در تخته‌گیره"
 
-#: ../src/e-util/e-html-editor-actions.c:978
+#: ../src/e-util/e-html-editor-actions.c:1107
 #, fuzzy
 #| msgid "Cut selected events to the clipboard"
 msgid "Cut selected text to the clipboard"
 msgstr "بریدن رویدادهای انتخاب شده و انتقال آن به تخته‌گیره"
 
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:985
+#: ../src/e-util/e-html-editor-actions.c:1114
 #, fuzzy
 #| msgid "Paste events from the clipboard"
 msgid "Paste text from the clipboard"
 msgstr "چسباندن رویدادها از تخته‌گیره"
 
-#: ../src/e-util/e-html-editor-actions.c:992
+#: ../src/e-util/e-html-editor-actions.c:1121
 msgid "Redo the last undone action"
 msgstr "بازانجام آخرین عمل برگردانده شده"
 
-#: ../src/e-util/e-html-editor-actions.c:1006
+#: ../src/e-util/e-html-editor-actions.c:1135
 msgid "Undo the last action"
 msgstr "برگردان آخرین عمل"
 
-#: ../src/e-util/e-html-editor-actions.c:1027
+#: ../src/e-util/e-html-editor-actions.c:1156
 msgid "For_mat"
 msgstr "_قالب"
 
-#: ../src/e-util/e-html-editor-actions.c:1034
+#: ../src/e-util/e-html-editor-actions.c:1163
 msgid "_Paragraph Style"
 msgstr "_سبک پاراگراف"
 
-#: ../src/e-util/e-html-editor-actions.c:1048
-#: ../src/e-util/e-html-editor-image-dialog.c:590
+#: ../src/e-util/e-html-editor-actions.c:1177
+#: ../src/e-util/e-html-editor-image-dialog.c:678
 msgid "_Alignment"
 msgstr "_قرارگیری"
 
-#: ../src/e-util/e-html-editor-actions.c:1055
+#: ../src/e-util/e-html-editor-actions.c:1184
 msgid "Current _Languages"
 msgstr "زبان‌های کنونی"
 
-#: ../src/e-util/e-html-editor-actions.c:1072
+#: ../src/e-util/e-html-editor-actions.c:1201
 msgid "_Increase Indent"
 msgstr "_افزایش تورفتگی"
 
-#: ../src/e-util/e-html-editor-actions.c:1074
+#: ../src/e-util/e-html-editor-actions.c:1203
 msgid "Increase Indent"
 msgstr "افزایش تورفتگی"
 
-#: ../src/e-util/e-html-editor-actions.c:1079
-#: ../src/e-util/e-html-editor-actions.c:2087
+#: ../src/e-util/e-html-editor-actions.c:1208
+#: ../src/e-util/e-html-editor-actions.c:2250
 msgid "E_moji"
 msgstr "ا_موجی"
 
-#: ../src/e-util/e-html-editor-actions.c:1081
+#: ../src/e-util/e-html-editor-actions.c:1210
+#: ../src/e-util/e-html-editor-actions.c:1217
 msgid "Insert Emoji"
 msgstr "درج اموجی"
 
-#: ../src/e-util/e-html-editor-actions.c:1086
+#: ../src/e-util/e-html-editor-actions.c:1215
+#, fuzzy
+#| msgid "Insert Emoji"
+msgid "Insert E_moji"
+msgstr "درج اموجی"
+
+#: ../src/e-util/e-html-editor-actions.c:1222
 msgid "_HTML File…"
 msgstr "پروندهٔ _HTML…"
 
-#: ../src/e-util/e-html-editor-actions.c:1093
+#: ../src/e-util/e-html-editor-actions.c:1229
 msgid "Te_xt File…"
-msgstr "پروندهٔ _متنی"
+msgstr "پروندهٔ _متنی…"
 
-#: ../src/e-util/e-html-editor-actions.c:1100
+#: ../src/e-util/e-html-editor-actions.c:1236
 msgid "Paste _Quotation"
 msgstr "چسباندن _نقل‌قول"
 
-#: ../src/e-util/e-html-editor-actions.c:1107
+#: ../src/e-util/e-html-editor-actions.c:1243
 msgid "_Find…"
 msgstr "_یافتن…"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1245
 msgid "Search for text"
 msgstr "جست‌وجو برای متن"
 
-#: ../src/e-util/e-html-editor-actions.c:1114
+#: ../src/e-util/e-html-editor-actions.c:1250
 msgid "Find A_gain"
 msgstr "یافتن _دوباره"
 
-#: ../src/e-util/e-html-editor-actions.c:1121
+#: ../src/e-util/e-html-editor-actions.c:1257
 msgid "Re_place…"
 msgstr "_جایگذاری…"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1259
 msgid "Search for and replace text"
 msgstr "جست‌وجو و جای‌گذاری متن"
 
-#: ../src/e-util/e-html-editor-actions.c:1128
+#: ../src/e-util/e-html-editor-actions.c:1264
 msgid "Check _Spelling…"
-msgstr "بررسی نو_شتاری"
+msgstr "بررسی نو_شتاری…"
 
-#: ../src/e-util/e-html-editor-actions.c:1135
+#: ../src/e-util/e-html-editor-actions.c:1271
 msgid "_Decrease Indent"
 msgstr "_کاهش تورفتگی"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1273
 msgid "Decrease Indent"
 msgstr "کاهش تورفتگی"
 
-#: ../src/e-util/e-html-editor-actions.c:1142
+#: ../src/e-util/e-html-editor-actions.c:1278
 msgid "_Wrap Lines"
 msgstr "_پیچیدن خط‌ها"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1152
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+#: ../src/e-util/e-html-editor-actions.c:1288
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:109
 msgid "_Center"
 msgstr "_مرکز"
 
-#: ../src/e-util/e-html-editor-actions.c:1154
+#: ../src/e-util/e-html-editor-actions.c:1290
 msgid "Center Alignment"
 msgstr "وسط‌چین"
 
+#. Justified
+#: ../src/e-util/e-html-editor-actions.c:1295
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:127
+#, fuzzy
+#| msgid "Justification"
+msgid "_Justified"
+msgstr "هم‌ترازی"
+
+#: ../src/e-util/e-html-editor-actions.c:1297
+msgid "Align Justified"
+msgstr ""
+
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1159
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+#: ../src/e-util/e-html-editor-actions.c:1302
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:100
 msgid "_Left"
 msgstr "_چپ"
 
-#: ../src/e-util/e-html-editor-actions.c:1161
+#: ../src/e-util/e-html-editor-actions.c:1304
 msgid "Left Alignment"
 msgstr "چپ‌چین"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1166
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+#: ../src/e-util/e-html-editor-actions.c:1309
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:118
 msgid "_Right"
 msgstr "_راست"
 
-#: ../src/e-util/e-html-editor-actions.c:1168
+#: ../src/e-util/e-html-editor-actions.c:1311
 msgid "Right Alignment"
 msgstr "راست‌چین"
 
-#: ../src/e-util/e-html-editor-actions.c:1176
+#: ../src/e-util/e-html-editor-actions.c:1319
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1178
+#: ../src/e-util/e-html-editor-actions.c:1321
 msgid "HTML editing mode"
 msgstr "حالت ویرایش HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1183
+#: ../src/e-util/e-html-editor-actions.c:1326
 msgid "Plain _Text"
 msgstr "متن _خام"
 
-#: ../src/e-util/e-html-editor-actions.c:1185
+#: ../src/e-util/e-html-editor-actions.c:1328
 msgid "Plain text editing mode"
 msgstr "حالت ویرایش متن خام"
 
-#: ../src/e-util/e-html-editor-actions.c:1193
+#: ../src/e-util/e-html-editor-actions.c:1336
 msgid "_Normal"
 msgstr "_عادی"
 
-#: ../src/e-util/e-html-editor-actions.c:1200
+#: ../src/e-util/e-html-editor-actions.c:1343
 msgid "Heading _1"
 msgstr "سرایند _۱"
 
-#: ../src/e-util/e-html-editor-actions.c:1207
+#: ../src/e-util/e-html-editor-actions.c:1350
 msgid "Heading _2"
 msgstr "سرایند _۲"
 
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1357
 msgid "Heading _3"
 msgstr "سرایند _۳"
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1364
 msgid "Heading _4"
 msgstr "سرایند _۴"
 
-#: ../src/e-util/e-html-editor-actions.c:1228
+#: ../src/e-util/e-html-editor-actions.c:1371
 msgid "Heading _5"
 msgstr "سرایند _۵"
 
-#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1378
 msgid "Heading _6"
 msgstr "سرایند _۶"
 
-#: ../src/e-util/e-html-editor-actions.c:1242
+#: ../src/e-util/e-html-editor-actions.c:1385
 msgid "_Preformatted"
 msgstr "_پیش‌قالب‌بسته"
 
-#: ../src/e-util/e-html-editor-actions.c:1249
+#: ../src/e-util/e-html-editor-actions.c:1392
 msgid "A_ddress"
 msgstr "_نشانی"
 
-#: ../src/e-util/e-html-editor-actions.c:1256
+#: ../src/e-util/e-html-editor-actions.c:1399
 msgid "_Bulleted List"
 msgstr "فهرست _گلوله‌ای"
 
-#: ../src/e-util/e-html-editor-actions.c:1263
+#: ../src/e-util/e-html-editor-actions.c:1406
 msgid "_Roman Numeral List"
 msgstr "فهرست عددی _رومی"
 
-#: ../src/e-util/e-html-editor-actions.c:1270
+#: ../src/e-util/e-html-editor-actions.c:1413
 msgid "Numbered _List"
 msgstr "فهرست _عددی"
 
-#: ../src/e-util/e-html-editor-actions.c:1277
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "_Alphabetical List"
 msgstr "فهرست _الفبایی"
 
-#: ../src/e-util/e-html-editor-actions.c:1293
-#: ../src/e-util/e-html-editor-actions.c:1331
+#: ../src/e-util/e-html-editor-actions.c:1436
+#: ../src/e-util/e-html-editor-actions.c:1474
 msgid "_Image…"
 msgstr "_تصویر…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1439
 msgid "Insert Image"
 msgstr "درج تصویر"
 
-#: ../src/e-util/e-html-editor-actions.c:1301
-#: ../src/e-util/e-html-editor-actions.c:1338
+#: ../src/e-util/e-html-editor-actions.c:1444
+#: ../src/e-util/e-html-editor-actions.c:1481
 msgid "_Link…"
 msgstr "_پیوند…"
 
-#: ../src/e-util/e-html-editor-actions.c:1303
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Insert Link"
 msgstr "درج پیوند"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1309
-#: ../src/e-util/e-html-editor-actions.c:1353
+#: ../src/e-util/e-html-editor-actions.c:1452
+#: ../src/e-util/e-html-editor-actions.c:1496
 msgid "_Rule…"
 msgstr "_نقش…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1455
 msgid "Insert Rule"
 msgstr "درج قاعده"
 
-#: ../src/e-util/e-html-editor-actions.c:1317
-#: ../src/e-util/e-html-editor-actions.c:1360
+#: ../src/e-util/e-html-editor-actions.c:1460
+#: ../src/e-util/e-html-editor-actions.c:1503
 msgid "_Table…"
 msgstr "_جدول…"
 
-#: ../src/e-util/e-html-editor-actions.c:1319
+#: ../src/e-util/e-html-editor-actions.c:1462
 msgid "Insert Table"
 msgstr "درج جدول"
 
-#: ../src/e-util/e-html-editor-actions.c:1324
+#: ../src/e-util/e-html-editor-actions.c:1467
 msgid "_Cell…"
 msgstr "_سلول…"
 
-#: ../src/e-util/e-html-editor-actions.c:1345
+#: ../src/e-util/e-html-editor-actions.c:1488
 msgid "Pa_ge…"
 msgstr "_صفحه…"
 
-#: ../src/e-util/e-html-editor-actions.c:1369
+#: ../src/e-util/e-html-editor-actions.c:1512
 msgid "Font _Size"
 msgstr "اندازهٔ _قلم"
 
-#: ../src/e-util/e-html-editor-actions.c:1376
+#: ../src/e-util/e-html-editor-actions.c:1519
 msgid "_Font Style"
 msgstr "سبک _قلم"
 
-#: ../src/e-util/e-html-editor-actions.c:1383
+#: ../src/e-util/e-html-editor-actions.c:1526
 msgid "Paste As _Text"
 msgstr "جایگذاری به شکل _متن"
 
-#: ../src/e-util/e-html-editor-actions.c:1394
+#: ../src/e-util/e-html-editor-actions.c:1537
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_سیاه"
 
-#: ../src/e-util/e-html-editor-actions.c:1396
+#: ../src/e-util/e-html-editor-actions.c:1539
 msgid "Bold"
 msgstr "سیاه"
 
-#: ../src/e-util/e-html-editor-actions.c:1402
+#: ../src/e-util/e-html-editor-actions.c:1545
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_کج"
 
-#: ../src/e-util/e-html-editor-actions.c:1404
+#: ../src/e-util/e-html-editor-actions.c:1547
 msgid "Italic"
 msgstr "کج"
 
-#: ../src/e-util/e-html-editor-actions.c:1410
-msgid "_Plain Text"
-msgstr "متن _خام"
-
-#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1553
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "خط _خورده"
 
-#: ../src/e-util/e-html-editor-actions.c:1420
+#: ../src/e-util/e-html-editor-actions.c:1555
 msgid "Strikethrough"
 msgstr "خط‌خورده"
 
-#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1561
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Subs_cript"
+msgstr "_کدنوشته:"
+
+#: ../src/e-util/e-html-editor-actions.c:1563
+#, fuzzy
+#| msgid "_Subscribe"
+msgid "Subscript"
+msgstr "ا_شتراک"
+
+#: ../src/e-util/e-html-editor-actions.c:1569
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Su_perscript"
+msgstr "_کدنوشته:"
+
+#: ../src/e-util/e-html-editor-actions.c:1571
+#, fuzzy
+#| msgid "Description"
+msgid "Superscript"
+msgstr "شرح"
+
+#: ../src/e-util/e-html-editor-actions.c:1577
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "_زیرخط"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1579
 msgid "Underline"
 msgstr "زیرخط"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1589
 msgid "-2"
 msgstr "-۲"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1597
 msgid "-1"
 msgstr "-۱"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1454
+#: ../src/e-util/e-html-editor-actions.c:1605
 msgid "+0"
 msgstr "+۰"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1462
+#: ../src/e-util/e-html-editor-actions.c:1613
 msgid "+1"
 msgstr "+۱"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1470
+#: ../src/e-util/e-html-editor-actions.c:1621
 msgid "+2"
 msgstr "+۲"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1629
 msgid "+3"
 msgstr "+۳"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1486
+#: ../src/e-util/e-html-editor-actions.c:1637
 msgid "+4"
 msgstr "+۴"
 
-#: ../src/e-util/e-html-editor-actions.c:1505
+#: ../src/e-util/e-html-editor-actions.c:1656
 msgid "Cell Contents"
 msgstr "محتوای سلّول"
 
-#: ../src/e-util/e-html-editor-actions.c:1512
+#: ../src/e-util/e-html-editor-actions.c:1663
 msgid "Column"
 msgstr "ستون"
 
-#: ../src/e-util/e-html-editor-actions.c:1519
+#: ../src/e-util/e-html-editor-actions.c:1670
 msgid "Row"
 msgstr "ردیف"
 
-#: ../src/e-util/e-html-editor-actions.c:1526
+#: ../src/e-util/e-html-editor-actions.c:1677
 msgid "Table"
 msgstr "جدول"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1536
+#: ../src/e-util/e-html-editor-actions.c:1687
 msgid "Table Delete"
 msgstr "حذف جدولی"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1544
+#: ../src/e-util/e-html-editor-actions.c:1695
 msgid "Table Insert"
 msgstr "درج جدولی"
 
-#: ../src/e-util/e-html-editor-actions.c:1551
+#: ../src/e-util/e-html-editor-actions.c:1702
 msgid "Properties"
 msgstr "ترجیحات"
 
-#: ../src/e-util/e-html-editor-actions.c:1569
+#: ../src/e-util/e-html-editor-actions.c:1720
+#, fuzzy
+#| msgid "_Delete all"
+msgid "Delete Rule"
+msgstr "_حذف همه"
+
+#: ../src/e-util/e-html-editor-actions.c:1727
+#, fuzzy
+#| msgid "_Delete Message"
+msgid "Delete Image"
+msgstr "_حذف پیام"
+
+#: ../src/e-util/e-html-editor-actions.c:1734
 msgid "Column After"
 msgstr "ستون بعد"
 
-#: ../src/e-util/e-html-editor-actions.c:1576
+#: ../src/e-util/e-html-editor-actions.c:1741
 msgid "Column Before"
 msgstr "ستون پیشین"
 
-#: ../src/e-util/e-html-editor-actions.c:1583
+#: ../src/e-util/e-html-editor-actions.c:1748
 msgid "Insert _Link"
 msgstr "درج _پیوند"
 
-#: ../src/e-util/e-html-editor-actions.c:1590
+#: ../src/e-util/e-html-editor-actions.c:1755
 msgid "Row Above"
 msgstr "ردیف بالا"
 
-#: ../src/e-util/e-html-editor-actions.c:1597
+#: ../src/e-util/e-html-editor-actions.c:1762
 msgid "Row Below"
 msgstr "ردیف پایین"
 
-#: ../src/e-util/e-html-editor-actions.c:1604
+#: ../src/e-util/e-html-editor-actions.c:1769
 msgid "Cell…"
 msgstr "سلول…"
 
-#: ../src/e-util/e-html-editor-actions.c:1611
+#: ../src/e-util/e-html-editor-actions.c:1776
 msgid "Image…"
 msgstr "تصویر…"
 
-#: ../src/e-util/e-html-editor-actions.c:1618
+#: ../src/e-util/e-html-editor-actions.c:1783
 msgid "Link…"
 msgstr "پیوند…"
 
-#: ../src/e-util/e-html-editor-actions.c:1625
+#: ../src/e-util/e-html-editor-actions.c:1790
 msgid "Page…"
 msgstr "صفحه…"
 
-#: ../src/e-util/e-html-editor-actions.c:1632
+#: ../src/e-util/e-html-editor-actions.c:1797
 msgid "Paragraph…"
 msgstr "پاراگراف…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1640
+#: ../src/e-util/e-html-editor-actions.c:1805
 msgid "Rule…"
 msgstr "قاعده…"
 
-#: ../src/e-util/e-html-editor-actions.c:1647
+#: ../src/e-util/e-html-editor-actions.c:1812
 msgid "Table…"
 msgstr "جدول…"
 
-#: ../src/e-util/e-html-editor-actions.c:1654
+#: ../src/e-util/e-html-editor-actions.c:1819
 msgid "Text…"
 msgstr "متن…"
 
-#: ../src/e-util/e-html-editor-actions.c:1661
+#: ../src/e-util/e-html-editor-actions.c:1826
 msgid "Remove Link"
 msgstr "برداشتن پیوند"
 
-#: ../src/e-util/e-html-editor-actions.c:1678
+#: ../src/e-util/e-html-editor-actions.c:1843
 msgid "Add Word to Dictionary"
 msgstr "افزودن واژه به واژه‌نامه"
 
-#: ../src/e-util/e-html-editor-actions.c:1685
+#: ../src/e-util/e-html-editor-actions.c:1850
 msgid "Ignore Misspelled Word"
 msgstr "نادیده گرفتن واژگان اشتباه"
 
-#: ../src/e-util/e-html-editor-actions.c:1692
+#: ../src/e-util/e-html-editor-actions.c:1857
 msgid "Add Word To"
 msgstr "افزودن واژه به"
 
-#: ../src/e-util/e-html-editor-actions.c:1701
+#: ../src/e-util/e-html-editor-actions.c:1866
 msgid "More Suggestions"
 msgstr "پیشنهادهای بیش‌تر"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1936
+#: ../src/e-util/e-html-editor-actions.c:2101
 #, c-format
 msgid "%s Dictionary"
 msgstr "واژه‌نامهٔ %s"
 
-#: ../src/e-util/e-html-editor-actions.c:2015
+#: ../src/e-util/e-html-editor-actions.c:2178
 msgid "_Emoticon"
 msgstr "_شکلک"
 
-#: ../src/e-util/e-html-editor-actions.c:2016
+#: ../src/e-util/e-html-editor-actions.c:2179
 msgid "Insert Emoticon"
 msgstr "درج شکلک"
 
-#: ../src/e-util/e-html-editor-actions.c:2084
+#: ../src/e-util/e-html-editor-actions.c:2247
 msgid "Re_place"
 msgstr "جای‌_گزینی"
 
-#: ../src/e-util/e-html-editor-actions.c:2090
+#: ../src/e-util/e-html-editor-actions.c:2253
 msgid "_Image"
 msgstr "_تصویر"
 
-#: ../src/e-util/e-html-editor-actions.c:2093
+#: ../src/e-util/e-html-editor-actions.c:2256
 msgid "_Link"
 msgstr "_پیوند"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:2097
+#: ../src/e-util/e-html-editor-actions.c:2260
 msgid "_Rule"
 msgstr "_قاعده"
 
-#: ../src/e-util/e-html-editor-actions.c:2100
+#: ../src/e-util/e-html-editor-actions.c:2263
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_جدول"
 
-#: ../src/e-util/e-html-editor.c:743
+#: ../src/e-util/e-html-editor.c:899
 msgid "Paragraph Style"
 msgstr "سبک پاراگراف"
 
-#: ../src/e-util/e-html-editor.c:757
+#: ../src/e-util/e-html-editor.c:913
 msgid "Editing Mode"
 msgstr "حالت ویرایش"
 
-#: ../src/e-util/e-html-editor.c:769
+#: ../src/e-util/e-html-editor.c:925
 msgid "Font Color"
 msgstr "رنگ قلم"
 
-#: ../src/e-util/e-html-editor.c:779
+#: ../src/e-util/e-html-editor.c:936
+#, fuzzy
+#| msgid "_Background:"
+msgid "Background Color"
+msgstr "_پس‌زمینه:"
+
+#: ../src/e-util/e-html-editor.c:946
 msgid "Font Size"
 msgstr "اندازهٔ قلم"
 
+#: ../src/e-util/e-html-editor.c:955
+#, fuzzy
+#| msgid "Account Name"
+msgid "Font Name"
+msgstr "نام حساب"
+
+#: ../src/e-util/e-html-editor.c:1579
+#, fuzzy
+#| msgid "Failed to authenticate.\n"
+msgid "Failed to obtain content of editor"
+msgstr "تأیید هویت شکست خورد.\n"
+
 #: ../src/e-util/e-html-editor-cell-dialog.c:408
 msgid "<b>Scope</b>"
 msgstr "<b>حوزه</b>"
@@ -13514,20 +13881,20 @@ msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b> قرارگیری و رفتار</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
-#: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:648
+#: ../src/e-util/e-html-editor-hrule-dialog.c:306
+#: ../src/e-util/e-html-editor-table-dialog.c:639
 msgid "Left"
 msgstr "چپ"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
-#: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-table-dialog.c:640
 msgid "Center"
 msgstr "مرکز"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
-#: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-table-dialog.c:641
 msgid "Right"
 msgstr "راست"
 
@@ -13536,17 +13903,17 @@ msgid "_Horizontal:"
 msgstr "_افقی:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:580
+#: ../src/e-util/e-html-editor-image-dialog.c:668
 msgid "Top"
 msgstr "بالا"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:581
+#: ../src/e-util/e-html-editor-image-dialog.c:669
 msgid "Middle"
 msgstr "وسط"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:582
+#: ../src/e-util/e-html-editor-image-dialog.c:670
 msgid "Bottom"
 msgstr "پایین"
 
@@ -13565,8 +13932,8 @@ msgid "_Header Style"
 msgstr "سبک سرایند"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:520
-#: ../src/e-util/e-html-editor-table-dialog.c:560
+#: ../src/e-util/e-html-editor-image-dialog.c:609
+#: ../src/e-util/e-html-editor-table-dialog.c:551
 msgid "<b>Layout</b>"
 msgstr "<b>چینش</b>"
 
@@ -13584,12 +13951,12 @@ msgid "Co_lumn Span:"
 msgstr ""
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:664
+#: ../src/e-util/e-html-editor-table-dialog.c:655
 msgid "<b>Background</b>"
 msgstr "<b>پس‌زمینه</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:677
+#: ../src/e-util/e-html-editor-table-dialog.c:668
 msgid "Transparent"
 msgstr "شفّاف"
 
@@ -13598,17 +13965,17 @@ msgid "C_olor:"
 msgstr "_رنگ:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:640
-#: ../src/e-util/e-html-editor-image-dialog.c:476
-#: ../src/e-util/e-html-editor-table-dialog.c:692
+#: ../src/e-util/e-html-editor-image-dialog.c:565
+#: ../src/e-util/e-html-editor-table-dialog.c:683
 msgid "Images"
 msgstr "تصویرها"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:645
 #: ../src/e-util/e-html-editor-cell-dialog.c:648
-#: ../src/e-util/e-html-editor-image-dialog.c:481
-#: ../src/e-util/e-html-editor-image-dialog.c:484
-#: ../src/e-util/e-html-editor-table-dialog.c:697
-#: ../src/e-util/e-html-editor-table-dialog.c:702
+#: ../src/e-util/e-html-editor-image-dialog.c:570
+#: ../src/e-util/e-html-editor-image-dialog.c:573
+#: ../src/e-util/e-html-editor-table-dialog.c:688
+#: ../src/e-util/e-html-editor-table-dialog.c:693
 msgid "Choose Background Image"
 msgstr "گزینش تصویر پس‌زمینه"
 
@@ -13617,8 +13984,8 @@ msgid "_Image:"
 msgstr "_تصویر:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:669
-#: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:723
+#: ../src/e-util/e-html-editor-page-dialog.c:545
+#: ../src/e-util/e-html-editor-table-dialog.c:714
 msgid "_Remove image"
 msgstr "_برداشتن تصویر"
 
@@ -13648,171 +14015,194 @@ msgstr "_پیچش جست‌وجو"
 msgid "Find"
 msgstr "یافتن"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+#: ../src/e-util/e-html-editor-hrule-dialog.c:241
 msgid "<b>Size</b>"
 msgstr "<b>اندازه</b>"
 
 #. Width
-#: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:538
-#: ../src/e-util/e-html-editor-table-dialog.c:571
+#: ../src/e-util/e-html-editor-hrule-dialog.c:261
+#: ../src/e-util/e-html-editor-image-dialog.c:627
+#: ../src/e-util/e-html-editor-table-dialog.c:562
 msgid "_Width:"
 msgstr "_پهنا:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-hrule-dialog.c:286
 msgid "_Size:"
 msgstr "_اندازه:"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+#: ../src/e-util/e-html-editor-hrule-dialog.c:293
 msgid "<b>Style</b>"
 msgstr "<b>سبک</b>"
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:657
+#: ../src/e-util/e-html-editor-hrule-dialog.c:318
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "_Alignment:"
 msgstr "_قرارگیری:"
 
 #. Shaded
-#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+#: ../src/e-util/e-html-editor-hrule-dialog.c:324
 msgid "S_haded"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#: ../src/e-util/e-html-editor-hrule-dialog.c:341
 msgid "Rule properties"
 msgstr "ویژگی‌های قاعده"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:465
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:514
+#: ../src/e-util/e-html-editor-image-dialog.c:554
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:65
+#: ../src/e-util/e-html-editor-table-dialog.c:505
 msgid "<b>General</b>"
 msgstr "<b>عمومی</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:499
+#: ../src/e-util/e-html-editor-image-dialog.c:588
 msgid "_Source:"
 msgstr "_منبع:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:562
+#: ../src/e-util/e-html-editor-image-dialog.c:640
 msgid "_Height:"
 msgstr "_بلندا:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:603
+#: ../src/e-util/e-html-editor-image-dialog.c:659
+msgid "Preserve aspect ratio"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-image-dialog.c:691
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:619
+#: ../src/e-util/e-html-editor-image-dialog.c:707
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-image-dialog.c:635
-#: ../src/e-util/e-html-editor-table-dialog.c:638
+#: ../src/e-util/e-html-editor-image-dialog.c:723
+#: ../src/e-util/e-html-editor-table-dialog.c:629
 msgid "_Border:"
 msgstr "_حاشیه:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:645
+#: ../src/e-util/e-html-editor-image-dialog.c:733
 msgid "<b>Link</b>"
 msgstr "<b>پیوند</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:213
+#: ../src/e-util/e-html-editor-image-dialog.c:751
+#: ../src/e-util/e-html-editor-link-dialog.c:210
 msgid "_URL:"
 msgstr "_نشانی اینترنتی:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:668
+#: ../src/e-util/e-html-editor-image-dialog.c:756
 msgid "_Test URL…"
 msgstr "_آزمون نشانی…"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:685
+#: ../src/e-util/e-html-editor-image-dialog.c:773
 msgid "Image Properties"
 msgstr "ویژگی‌های تصویر"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:236
+#: ../src/e-util/e-html-editor-link-dialog.c:233
 msgid "_Remove Link"
 msgstr "_برداشتن پیوند"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:261
+#: ../src/e-util/e-html-editor-link-dialog.c:258
 msgid "Link Properties"
 msgstr "ویژگی‌های پیوند"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:68
+#: ../src/e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../src/e-util/e-html-editor-page-dialog.c:77
+#: ../src/e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr "جوهر آبی"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:86
+#: ../src/e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr "کاغذ"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:95
+#: ../src/e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr "روبان"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:104
+#: ../src/e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr "نیمه‌شب"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:122 ../src/mail/filtertypes.xml.in.h:38
+#: ../src/e-util/e-html-editor-page-dialog.c:125 ../src/mail/filtertypes.xml.in.h:38
 #: ../src/mail/searchtypes.xml.in.h:41 ../src/mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "پیش‌نویس"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:131
+#: ../src/e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr "کاغذ رسم"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:379
-msgid "<b>Colors</b>"
-msgstr "<b>رنگ‌ها</b>"
+#. == Colors ==
+#: ../src/e-util/e-html-editor-page-dialog.c:402
+#, fuzzy
+#| msgid "Color"
+msgid "Colors"
+msgstr "رنگ"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:398
+#: ../src/e-util/e-html-editor-page-dialog.c:422
 msgid "_Text:"
 msgstr "_متن:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:413
+#: ../src/e-util/e-html-editor-page-dialog.c:437
 msgid "_Link:"
 msgstr "_پیوند:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:428
+#: ../src/e-util/e-html-editor-page-dialog.c:452
 msgid "_Visited Link:"
 msgstr "پیوندهای _دیده‌شده:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:443
+#: ../src/e-util/e-html-editor-page-dialog.c:467
 msgid "_Background:"
 msgstr "_پس‌زمینه:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:451
-msgid "<b>Background Image</b>"
-msgstr "<b>تصویر پس‌زمینه</b>"
+#. == Text ==
+#: ../src/e-util/e-html-editor-page-dialog.c:475
+#, fuzzy
+#| msgid "_Text:"
+msgid "Text"
+msgstr "_متن:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/e-util/e-html-editor-page-dialog.c:493
+#, fuzzy
+#| msgid "_Folder Name:"
+msgid "_Font Name:"
+msgstr "_نام پوشه:"
+
+#. == Background Image ==
+#: ../src/e-util/e-html-editor-page-dialog.c:500
+#, fuzzy
+#| msgid "Choose Background Image"
+msgid "Background Image"
+msgstr "گزینش تصویر پس‌زمینه"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:523
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "_Template:"
 msgstr "_الگو:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:287
+#: ../src/e-util/e-html-editor-page-dialog.c:531
+#: ../src/e-util/e-import-assistant.c:313
 msgid "Select a file"
 msgstr "یک پرونده انتخاب کنید"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:488
+#: ../src/e-util/e-html-editor-page-dialog.c:538
 msgid "_Custom:"
 msgstr "_سفارشی:"
 
-#: ../src/e-util/e-html-editor-page-dialog.c:515
+#: ../src/e-util/e-html-editor-page-dialog.c:567
 msgid "Page Properties"
 msgstr "ویژگی‌های صفحه"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:82
 msgid "_Style:"
 msgstr "_سبک:"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:89
 msgid "<b>Alignment</b>"
 msgstr "<b>قرارگیری</b>"
 
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:163
 msgid "Paragraph Properties"
 msgstr "ویژگی‌های پاراگراف"
 
@@ -13906,33 +14296,33 @@ msgstr "افزودن واژه"
 msgid "Spell Checking"
 msgstr "غلط‌یاب املایی"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:536
+#: ../src/e-util/e-html-editor-table-dialog.c:527
 msgid "_Rows:"
 msgstr "_ردیف‌ها:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:553
+#: ../src/e-util/e-html-editor-table-dialog.c:544
 msgid "C_olumns:"
 msgstr "_ستون‌ها:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:604
+#: ../src/e-util/e-html-editor-table-dialog.c:595
 msgid "_Spacing:"
 msgstr "_فاصله‌گذاری:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:621
+#: ../src/e-util/e-html-editor-table-dialog.c:612
 msgid "_Padding:"
 msgstr "_فاصله‌دهی:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:685
+#: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2427
+#: ../src/e-util/e-webdav-browser.c:2565
 msgid "_Color:"
 msgstr "_رنگ:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:716
+#: ../src/e-util/e-html-editor-table-dialog.c:707
 msgid "Image:"
 msgstr "تصویر:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:743
+#: ../src/e-util/e-html-editor-table-dialog.c:734
 msgid "Table Properties"
 msgstr "ویژگی‌های جدول"
 
@@ -13944,78 +14334,84 @@ msgstr "_اندازه:"
 msgid "Text Properties"
 msgstr "ویژگی‌های متن"
 
-#: ../src/e-util/e-import-assistant.c:259
+#: ../src/e-util/e-import-assistant.c:285
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type of "
 "file it is from the list."
 msgstr ""
 
-#: ../src/e-util/e-import-assistant.c:301 ../src/e-util/e-import-assistant.c:480
+#: ../src/e-util/e-import-assistant.c:327 ../src/e-util/e-import-assistant.c:526
 msgid "File _type:"
 msgstr "_گونهٔ پرونده:"
 
-#: ../src/e-util/e-import-assistant.c:344 ../src/e-util/e-import-assistant.c:962
+#: ../src/e-util/e-import-assistant.c:355
+#, fuzzy
+#| msgid "Preview"
+msgid "Pre_view:"
+msgstr "پیش‌نمایش"
+
+#: ../src/e-util/e-import-assistant.c:390 ../src/e-util/e-import-assistant.c:1008
 msgid "Choose the destination for this import"
 msgstr "گزینش مقصد برای این درون‌ریزی"
 
-#: ../src/e-util/e-import-assistant.c:370
+#: ../src/e-util/e-import-assistant.c:416
 msgid "Choose the type of importer to run:"
 msgstr "نوع واردکنندهٔ اجرا شونده را انتخاب کنید:"
 
-#: ../src/e-util/e-import-assistant.c:379
+#: ../src/e-util/e-import-assistant.c:425
 msgid "Import data and settings from _older programs"
 msgstr "وارد کردن داده و تنظیمات از برنامه‌های _قدیمی‌تر"
 
-#: ../src/e-util/e-import-assistant.c:387
+#: ../src/e-util/e-import-assistant.c:433
 msgid "Import a _single file"
 msgstr "وارد کردن یک _تک پرونده"
 
-#: ../src/e-util/e-import-assistant.c:409
+#: ../src/e-util/e-import-assistant.c:455
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "لطفاً اطلاعاتی را که می‌خواهید وارد شود انتخاب کنید:"
 
-#: ../src/e-util/e-import-assistant.c:541
+#: ../src/e-util/e-import-assistant.c:587
 msgid ""
 "Evolution checked for settings to import from the following applications: Pine, "
 "Netscape, Elm, iCalendar, KMail. No importable settings found. If you would like "
 "to try again, please click the “Back” button."
 msgstr ""
 
-#: ../src/e-util/e-import-assistant.c:568
+#: ../src/e-util/e-import-assistant.c:614
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "از %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:814
+#: ../src/e-util/e-import-assistant.c:860
 msgid "_Cancel Import"
 msgstr "_لغو درون‌ریزی"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:1007
 msgid "Preview data to be imported"
 msgstr "پیش‌نمایش داده‌ها برای درون‌ریزی"
 
-#: ../src/e-util/e-import-assistant.c:967 ../src/e-util/e-import-assistant.c:980
-#: ../src/e-util/e-import-assistant.c:1333 ../src/e-util/e-import-assistant.c:1410
-#: ../src/e-util/e-import-assistant.c:1419
+#: ../src/e-util/e-import-assistant.c:1013 ../src/e-util/e-import-assistant.c:1026
+#: ../src/e-util/e-import-assistant.c:1399 ../src/e-util/e-import-assistant.c:1476
+#: ../src/e-util/e-import-assistant.c:1485
 msgid "Import Data"
 msgstr "درون‌ریزی داده"
 
-#: ../src/e-util/e-import-assistant.c:975
+#: ../src/e-util/e-import-assistant.c:1021
 msgid "Select what type of file you want to import from the list."
 msgstr "گونهٔ پرونده‌ای را که می‌خواهید از فهرست درون‌ریزی کنید را برگزینید."
 
-#: ../src/e-util/e-import-assistant.c:1323 ../src/e-util/e-import-assistant.c:1359
+#: ../src/e-util/e-import-assistant.c:1389 ../src/e-util/e-import-assistant.c:1425
 msgid "Evolution Import Assistant"
 msgstr "دستیار ورود اوولوشن"
 
-#: ../src/e-util/e-import-assistant.c:1340 ../src/e-util/e-import-assistant.c:1397
+#: ../src/e-util/e-import-assistant.c:1406 ../src/e-util/e-import-assistant.c:1463
 msgid "Import Location"
 msgstr "وارد کردن مکان"
 
-#: ../src/e-util/e-import-assistant.c:1352
+#: ../src/e-util/e-import-assistant.c:1418
 #, fuzzy
 #| msgid ""
 #| "Welcome to the Evolution Import Assistant.\n"
@@ -14030,21 +14426,21 @@ msgstr ""
 "این دستیار به شما کمک می‌کند داده‌های خارجی\n"
 "به اوولوشن وارد کنید."
 
-#: ../src/e-util/e-import-assistant.c:1369
+#: ../src/e-util/e-import-assistant.c:1435
 msgid "Importer Type"
 msgstr "گونهٔ درون‌ریز"
 
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:1445
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select Information to Import"
 msgstr "انتخاب شاخه برای وارد کردن به"
 
-#: ../src/e-util/e-import-assistant.c:1388
+#: ../src/e-util/e-import-assistant.c:1454
 msgid "Select a File"
 msgstr "گزینش یک پرونده"
 
-#: ../src/e-util/e-import-assistant.c:1405
+#: ../src/e-util/e-import-assistant.c:1471
 #, fuzzy
 #| msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgid "Click “Apply” to begin importing the file into Evolution."
@@ -14071,47 +14467,47 @@ msgstr "روز"
 msgid "Autogenerated"
 msgstr "تولید خودکار"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
+#: ../src/e-util/e-mail-signature-editor.c:321 ../src/mail/e-mail-notes.c:1019
 msgid "Close"
 msgstr "بستن"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
+#: ../src/e-util/e-mail-signature-editor.c:326 ../src/mail/e-mail-notes.c:1024
 #, fuzzy
 #| msgid "Save and Close"
 msgid "_Save and Close"
 msgstr "ذخیره و بستن"
 
-#: ../src/e-util/e-mail-signature-editor.c:558
+#: ../src/e-util/e-mail-signature-editor.c:549
 #, fuzzy
 #| msgid "Edit signature"
 msgid "Edit Signature"
 msgstr "ویرایش امضا"
 
-#: ../src/e-util/e-mail-signature-editor.c:591
+#: ../src/e-util/e-mail-signature-editor.c:582
 msgid "_Signature Name:"
 msgstr "نام _امضا:"
 
-#: ../src/e-util/e-mail-signature-editor.c:627
+#: ../src/e-util/e-mail-signature-editor.c:618
 msgid "Unnamed"
 msgstr "بی‌نام"
 
-#: ../src/e-util/e-mail-signature-manager.c:338
+#: ../src/e-util/e-mail-signature-manager.c:334
 msgid "Add _Script"
 msgstr "اضافه کردن _کدنوشته"
 
-#: ../src/e-util/e-mail-signature-manager.c:444
+#: ../src/e-util/e-mail-signature-manager.c:440
 #, fuzzy
 #| msgid "Add signature script"
 msgid "Add Signature Script"
 msgstr "اضافه کردن کدنوشتهٔ امضا"
 
-#: ../src/e-util/e-mail-signature-manager.c:538
+#: ../src/e-util/e-mail-signature-manager.c:534
 #, fuzzy
 #| msgid "Add signature script"
 msgid "Edit Signature Script"
 msgstr "اضافه کردن کدنوشتهٔ امضا"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:394
+#: ../src/e-util/e-mail-signature-script-dialog.c:386
 #, fuzzy
 #| msgid ""
 #| "The output of this script will be used as your\n"
@@ -14126,19 +14522,19 @@ msgstr ""
 "به کار خواهد رفت. نامی که مشخص می‌کنید تنها\n"
 "مصارف نمایشی خواهد داشت."
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:445
+#: ../src/e-util/e-mail-signature-script-dialog.c:437
 msgid "S_cript:"
 msgstr "_کدنوشته:"
 
-#: ../src/e-util/e-mail-signature-script-dialog.c:476
+#: ../src/e-util/e-mail-signature-script-dialog.c:468
 msgid "Script file must be executable."
 msgstr "پروندهٔ کدنوشته باید اجرایی باشد."
 
-#: ../src/e-util/e-map.c:886
+#: ../src/e-util/e-map.c:883
 msgid "World Map"
 msgstr "تقشهٔ جهان"
 
-#: ../src/e-util/e-map.c:889
+#: ../src/e-util/e-map.c:886
 #, fuzzy
 #| msgid ""
 #| "Mouse-based interactive map widget for selecting timezone. Keyboard users "
@@ -14182,12 +14578,12 @@ msgstr "در حال بار کردن تکلیف‌ها %s"
 msgid "Opening address book “%s”"
 msgstr "دفترچهٔ نشانی اوولوشن"
 
-#: ../src/e-util/e-misc-utils.c:3351
+#: ../src/e-util/e-misc-utils.c:3348
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "_دیگر این پیام نشان داده نشود"
 
-#: ../src/e-util/e-misc-utils.c:4249
+#: ../src/e-util/e-misc-utils.c:3990
 msgid ""
 "This address book server might be unreachable or the server name may be misspelled "
 "or your network connection could be down."
@@ -14195,18 +14591,18 @@ msgstr ""
 "ممکن است این کارساز دفترچهٔ نشانی غیر قابل دسترسی باشد یا نام کارساز اشتباه نوشته "
 "شده باشد یا اتّصال شبکهٔ شما قطع باشد."
 
-#: ../src/e-util/e-misc-utils.c:4261
+#: ../src/e-util/e-misc-utils.c:4002
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr ""
 
-#: ../src/e-util/e-misc-utils.c:4273
+#: ../src/e-util/e-misc-utils.c:4014
 #, fuzzy, c-format
 #| msgid "Failed to authenticate with LDAP server."
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "تأیید هویت با کارساز LDAP شکست خورد."
 
-#: ../src/e-util/e-misc-utils.c:4287
+#: ../src/e-util/e-misc-utils.c:4028
 #, fuzzy, c-format
 #| msgid ""
 #| "This LDAP server may use an older version of LDAP, which does not support this "
@@ -14222,7 +14618,7 @@ msgstr ""
 "این کارساز LDAP ممکن است نسخهٔ قدیمی‌تری از LDAP را به کار ببرد، که از این امکانات "
 "پشتیبانی نمی‌کند یا شاید غلط پیکربندی شده باشد. "
 
-#: ../src/e-util/e-misc-utils.c:4298
+#: ../src/e-util/e-misc-utils.c:4039
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support this "
 "functionality or it may be misconfigured. Ask your administrator for supported "
@@ -14232,24 +14628,51 @@ msgstr ""
 "پشتیبانی نمی‌کند یا شاید غلط پیکربندی شده باشد. پایه‌های جست‌وجوی پشتیبانی شده را از "
 "مدیرتان بپرسید."
 
-#: ../src/e-util/e-misc-utils.c:4331
+#: ../src/e-util/e-misc-utils.c:4072
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "اوولوشن با پشتیبانی LDAP ترجمه نشده"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4654
+#: ../src/e-util/e-misc-utils.c:4395
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
 msgstr "ناشناخته (%s)"
 
-#. Translators: The first %s is the language name, and the
-#. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4663
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../src/e-util/e-misc-utils.c:4404
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/e-util/e-misc-utils.c:4555
+#, fuzzy, c-format
+#| msgid "Click to mail %s"
+msgid "Click to call %s"
+msgstr "برای فرستادن نامه به %s کلیک کنید"
+
+#: ../src/e-util/e-misc-utils.c:4557
+msgid "Click to hide/unhide addresses"
+msgstr "کلیک برای نهفتن/آشکارسازی نشانی‌ها"
+
+#: ../src/e-util/e-misc-utils.c:4570
+#, fuzzy, c-format
+#| msgid "Enter the recipients of the message"
+msgid "Go to the section %s of the message"
+msgstr "گیرنده‌های پیام را وارد کنید"
+
+#: ../src/e-util/e-misc-utils.c:4572
+#, fuzzy
+#| msgid "Enter the recipients of the message"
+msgid "Go to the beginning of the message"
+msgstr "گیرنده‌های پیام را وارد کنید"
+
+#: ../src/e-util/e-misc-utils.c:4578
 #, c-format
-msgctxt "language"
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "Click to open %s"
+msgstr "برای باز کردن %s کلیک کنید"
 
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
@@ -14268,9 +14691,9 @@ msgid "_Search:"
 msgstr "_جست‌وجو:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/e-util/e-name-selector-dialog.c:1322
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1796
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:783
 #: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
@@ -14290,26 +14713,26 @@ msgid "Select Contacts from Address Book"
 msgstr "گزینش آشناها از دفترچهٔ نشانی"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, fuzzy, c-format
 #| msgid "E_xpand All Threads"
 msgid "E_xpand %s Inline"
 msgstr "_باز کردن همهٔ رشته‌ها"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3250
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
 msgstr "_رونوشت از %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3261
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "_برش %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3279
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "_ویرایش %s"
@@ -14365,7 +14788,13 @@ msgstr "به _خاطر سپردن این گذرواژه"
 msgid "_Remember this password for the remainder of this session"
 msgstr "به _خاطر سپردن این گذرواژه برای بقیهٔ این نشست"
 
-#: ../src/e-util/e-preferences-window.c:329
+#: ../src/e-util/e-preferences-window.c:300
+#, fuzzy
+#| msgid "_Help"
+msgid "Help"
+msgstr "راهنما"
+
+#: ../src/e-util/e-preferences-window.c:307
 msgid "Evolution Preferences"
 msgstr "ترجیحات اوولوشن"
 
@@ -14459,11 +14888,11 @@ msgstr "ایجاد یک نمایهٔ پیشکار جدید"
 msgid "Delete the selected proxy profile"
 msgstr "حذف نمایهٔ پیشکار گزیده"
 
-#: ../src/e-util/e-rule-editor.c:191
+#: ../src/e-util/e-rule-editor.c:188
 msgid "Add Rule"
 msgstr "اضافه کردن قاعده"
 
-#: ../src/e-util/e-rule-editor.c:302
+#: ../src/e-util/e-rule-editor.c:299
 msgid "Edit Rule"
 msgstr "ویرایش قاعده"
 
@@ -14472,35 +14901,35 @@ msgstr "ویرایش قاعده"
 msgid "Matches: %u"
 msgstr "تطابق‌ها: %Iu"
 
-#: ../src/e-util/e-search-bar.c:624
+#: ../src/e-util/e-search-bar.c:597
 msgid "Close the find bar"
 msgstr "بستن نوار یافتن"
 
-#: ../src/e-util/e-search-bar.c:632
+#: ../src/e-util/e-search-bar.c:605
 msgid "Fin_d:"
 msgstr "_یافتن:"
 
-#: ../src/e-util/e-search-bar.c:644
+#: ../src/e-util/e-search-bar.c:617
 msgid "Clear the search"
 msgstr "پاک‌سازی جست‌وجو"
 
-#: ../src/e-util/e-search-bar.c:671
+#: ../src/e-util/e-search-bar.c:644
 msgid "Find the previous occurrence of the phrase"
 msgstr "یافتن رخداد پیشین عبارت"
 
-#: ../src/e-util/e-search-bar.c:683
+#: ../src/e-util/e-search-bar.c:656
 msgid "Find the next occurrence of the phrase"
 msgstr "یافتن رخداد بعدی عبارت"
 
-#: ../src/e-util/e-search-bar.c:692
+#: ../src/e-util/e-search-bar.c:665
 msgid "Mat_ch case"
 msgstr "_تطابق کوچک و بزرگی حروف"
 
-#: ../src/e-util/e-search-bar.c:720
+#: ../src/e-util/e-search-bar.c:693
 msgid "Reached bottom of page, continued from top"
 msgstr "رسیدن به پایین صفحه، ادامه از بالا"
 
-#: ../src/e-util/e-search-bar.c:742
+#: ../src/e-util/e-search-bar.c:715
 msgid "Reached top of page, continued from bottom"
 msgstr "رسیدن به بالای صفحه، ادامه از پایین"
 
@@ -14546,13 +14975,13 @@ msgstr "گزینه‌ها ارسال"
 msgid "R_eply requested"
 msgstr "_پاسخ درخواست شده است"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#. Translators: This is part of
 #: ../src/e-util/e-send-options.ui.h:20
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "در _عرض"
 
-#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#. Translators: This is part of
 #: ../src/e-util/e-send-options.ui.h:22
 msgctxt "ESendOptionsWithin"
 msgid "days"
@@ -14567,13 +14996,13 @@ msgstr "_هر وقت راحت بود"
 msgid "_Delay message delivery"
 msgstr "_به تأخیر انداختن تحویل پیام"
 
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#. Translators: This is part of
 #: ../src/e-util/e-send-options.ui.h:28
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_پس از"
 
-#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#. Translators: This is part of
 #: ../src/e-util/e-send-options.ui.h:30
 msgctxt "ESendOptionsAfter"
 msgid "days"
@@ -14583,7 +15012,7 @@ msgstr "روز"
 msgid "_Set expiration date"
 msgstr "_تنظیم تاریخ انقضا"
 
-#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#. Translators: This is part of
 #: ../src/e-util/e-send-options.ui.h:33
 msgctxt "ESendOptions"
 msgid "_Until"
@@ -14653,67 +15082,63 @@ msgstr "آگاهی برگشت"
 msgid "Sta_tus Tracking"
 msgstr "ردیابی وض_عیت"
 
-#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
+#: ../src/e-util/e-source-config.c:690 ../src/e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "نوع:"
 
-#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
+#: ../src/e-util/e-source-config.c:704 ../src/e-util/e-source-config.c:708
 msgid "Name:"
 msgstr "نام:"
 
-#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1752
+#: ../src/e-util/e-source-config.c:815 ../src/e-util/e-webdav-browser.c:1858
 msgid "Name cannot be empty"
 msgstr "نام نمی‌تواند خالی باشد"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1417
+#: ../src/e-util/e-source-config.c:1382
 msgid "Refresh every"
 msgstr "نوسازی هر"
 
-#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1412 ../src/e-util/e-source-config.c:1486
 msgid "Use a secure connection"
 msgstr "استفاده از یک اتّصال امن"
 
-#: ../src/e-util/e-source-config.c:1548
+#: ../src/e-util/e-source-config.c:1513
 #, fuzzy
 #| msgid "Imported Certificate"
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "گواهی وارد شده"
 
-#: ../src/e-util/e-source-config.c:1584
+#: ../src/e-util/e-source-config.c:1549
 msgid "User:"
 msgstr "کاربر:"
 
-#: ../src/e-util/e-source-selector.c:3236
+#: ../src/e-util/e-source-selector.c:3417
 msgid "Show"
 msgstr "نمایش"
 
-#: ../src/e-util/e-source-selector.c:3242
+#: ../src/e-util/e-source-selector.c:3423
 msgid "Group name"
 msgstr "نام گروه"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:714
+#: ../src/e-util/e-source-selector.c:3578 ../src/mail/e-mail-display.c:717
 msgid "_Hide"
 msgstr "_مخفی کردن"
 
-#: ../src/e-util/e-source-selector.c:3397 ../src/e-util/e-source-selector.c:3495
+#: ../src/e-util/e-source-selector.c:3578 ../src/e-util/e-source-selector.c:3676
 msgid "_Show"
 msgstr "_نمایش"
 
-#: ../src/e-util/e-source-selector.c:3449
+#: ../src/e-util/e-source-selector.c:3630
 msgid "Manage Groups"
 msgstr "مدیریت گروه‌ها"
 
-#: ../src/e-util/e-source-selector.c:3461
+#: ../src/e-util/e-source-selector.c:3642
 msgid "Available Groups:"
 msgstr "گروه‌های موجود:"
 
-#: ../src/e-util/e-source-selector-dialog.c:234
-msgid "_Destination"
-msgstr "م_قصد"
-
-#: ../src/e-util/e-source-selector-dialog.c:362
+#: ../src/e-util/e-source-selector-dialog.c:317
 msgid "Select destination"
 msgstr "گزینش مقصد"
 
@@ -14892,7 +15317,7 @@ msgstr ""
 msgid "Failed to refresh list of account sources"
 msgstr ""
 
-#: ../src/e-util/e-table-click-to-add.c:688
+#: ../src/e-util/e-table-click-to-add.c:686
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -14928,27 +15353,27 @@ msgstr "جابه‌جایی پیام‌های انتخاب شده به یک شا
 msgid "Select all column names"
 msgstr "انتخاب همهٔ یادداشت‌های قابل مشاهده"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Ascending)"
 msgstr "(صعودی)"
 
-#: ../src/e-util/e-table-config.c:388 ../src/e-util/e-table-config.c:434
+#: ../src/e-util/e-table-config.c:380 ../src/e-util/e-table-config.c:426
 msgid "(Descending)"
 msgstr "(نزولی)"
 
-#: ../src/e-util/e-table-config.c:395
+#: ../src/e-util/e-table-config.c:387
 msgid "Not sorted"
 msgstr "مرتب نشده"
 
-#: ../src/e-util/e-table-config.c:440
+#: ../src/e-util/e-table-config.c:432
 msgid "No grouping"
 msgstr "گروه نشده"
 
-#: ../src/e-util/e-table-config.c:545
+#: ../src/e-util/e-table-config.c:537
 msgid "Show Fields"
 msgstr "نمایش فیلدها"
 
-#: ../src/e-util/e-table-config.c:559
+#: ../src/e-util/e-table-config.c:551
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose the order of information to appear in the message list."
@@ -14962,11 +15387,11 @@ msgstr "پاک‌سازی _همه"
 msgid "_Show field in View"
 msgstr "_نمایش زمینه در نما"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1778
 msgid "Ascending"
 msgstr "صعودی"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1778
 msgid "Descending"
 msgstr "نزولی"
 
@@ -15024,7 +15449,7 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../src/e-util/e-table-field-chooser-dialog.c:224
+#: ../src/e-util/e-table-field-chooser-dialog.c:216
 msgid "Add a Column"
 msgstr "افزودن یک ستون"
 
@@ -15035,7 +15460,7 @@ msgstr "افزودن یک ستون"
 #. * Finally the %d is replaced with count of items in this group.
 #. * Example: "Family name: Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:366
+#: ../src/e-util/e-table-group-container.c:355
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -15048,89 +15473,89 @@ msgstr[1] "%s : %s (%Id مورد)"
 #. * The %d is replaced with count of items in this group.
 #. * Example: "Smith (13 items)"
 #.
-#: ../src/e-util/e-table-group-container.c:380
+#: ../src/e-util/e-table-group-container.c:369
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%Id مورد)"
 msgstr[1] "%s (%Id مورد)"
 
-#: ../src/e-util/e-table-header-item.c:1610
+#: ../src/e-util/e-table-header-item.c:1596
 msgid "Customize Current View"
 msgstr "سفارشی‌سازی نمای فعلی"
 
-#: ../src/e-util/e-table-header-item.c:1642
+#: ../src/e-util/e-table-header-item.c:1628
 msgid "Sort _Ascending"
 msgstr "چینش صعودی"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1631
 msgid "Sort _Descending"
 msgstr "چینش نزولی"
 
-#: ../src/e-util/e-table-header-item.c:1648
+#: ../src/e-util/e-table-header-item.c:1634
 msgid "_Reset sort"
 msgstr "_بازنشانی چینش"
 
-#: ../src/e-util/e-table-header-item.c:1651
+#: ../src/e-util/e-table-header-item.c:1637
 #, fuzzy
 #| msgid "Group By This Field"
 msgid "Group By This _Field"
 msgstr "گروه کردن از روی این فیلد"
 
-#: ../src/e-util/e-table-header-item.c:1654
+#: ../src/e-util/e-table-header-item.c:1640
 #, fuzzy
 #| msgid "Group By Box"
 msgid "Group By _Box"
 msgstr "گروه کردن از روی جعبه"
 
-#: ../src/e-util/e-table-header-item.c:1658
+#: ../src/e-util/e-table-header-item.c:1644
 #, fuzzy
 #| msgid "Remove This Column"
 msgid "Remove This _Column"
 msgstr "حذف این ستون"
 
-#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/e-util/e-table-header-item.c:1647
 msgid "Add a C_olumn…"
 msgstr "افزودن یک _ستون…"
 
-#: ../src/e-util/e-table-header-item.c:1665
+#: ../src/e-util/e-table-header-item.c:1651
 msgid "A_lignment"
 msgstr "_قرارگیری"
 
-#: ../src/e-util/e-table-header-item.c:1668
+#: ../src/e-util/e-table-header-item.c:1654
 msgid "B_est Fit"
 msgstr "بهترین _برازش"
 
-#: ../src/e-util/e-table-header-item.c:1671
+#: ../src/e-util/e-table-header-item.c:1657
 msgid "Format Column_s…"
 msgstr "_قالب‌بندی ستون‌ها…"
 
-#: ../src/e-util/e-table-header-item.c:1675
-#: ../src/shell/e-shell-window-actions.c:1226
+#: ../src/e-util/e-table-header-item.c:1661
+#: ../src/shell/e-shell-window-actions.c:1290
 msgid "Custo_mize Current View…"
 msgstr "سفارشی‌سازی _نمای فعلی…"
 
-#: ../src/e-util/e-table-header-item.c:1742
+#: ../src/e-util/e-table-header-item.c:1728
 msgid "_Sort By"
 msgstr "_چینش با"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1765
+#: ../src/e-util/e-table-header-item.c:1751
 msgid "_Custom"
 msgstr "_سفارشی"
 
-#: ../src/e-util/e-text.c:2105
+#: ../src/e-util/e-text.c:2090
 msgid "Select All"
 msgstr "انتخاب همه"
 
-#: ../src/e-util/e-text.c:2118
+#: ../src/e-util/e-text.c:2103
 msgid "Input Methods"
 msgstr "روش‌های ورود"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
-#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
-#: ../src/e-util/e-timezone-dialog.c:1015
+#: ../src/e-util/e-timezone-dialog.c:270 ../src/e-util/e-timezone-dialog.c:510
+#: ../src/e-util/e-timezone-dialog.c:514 ../src/e-util/e-timezone-dialog.c:518
+#: ../src/e-util/e-timezone-dialog.c:1005
 msgid "UTC"
 msgstr "ساعت گرینویچ"
 
@@ -15159,294 +15584,284 @@ msgstr "_گزینش"
 msgid "Timezone drop-down combination box"
 msgstr ""
 
-#: ../src/e-util/e-url-entry.c:102
+#: ../src/e-util/e-url-entry.c:155
 #, fuzzy
 #| msgid "Click here to go to URL"
 msgid "Click here to open the URL"
 msgstr "برای رفتن به نشانی اینترنتی اینجا کلیک کنید"
 
-#: ../src/e-util/e-url-entry.c:104
+#: ../src/e-util/e-url-entry.c:192
 msgid "Enter a URL here"
 msgstr "این‌جا نشانی‌ای وارد کنید"
 
-#: ../src/e-util/evolution-source-viewer.c:638
+#: ../src/e-util/evolution-source-viewer.c:632
 #, fuzzy
 #| msgid "Evolution Query"
 msgid "Evolution Source Viewer"
 msgstr "پرس و جوی اوولوشن"
 
 #. Translators: The name that is displayed in the user interface
-#: ../src/e-util/evolution-source-viewer.c:668
+#: ../src/e-util/evolution-source-viewer.c:662
 msgid "Display Name"
 msgstr "نام نمایشی"
 
-#: ../src/e-util/evolution-source-viewer.c:729
+#: ../src/e-util/evolution-source-viewer.c:671
+#, fuzzy
+#| msgid "_Flag:"
+msgid "Flags"
+msgstr "پرچم_:"
+
+#: ../src/e-util/evolution-source-viewer.c:723
 #: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "هویّت"
 
-#: ../src/e-util/e-webdav-browser.c:448
+#: ../src/e-util/e-webdav-browser.c:510
 msgid "Address book"
 msgstr "دفترچهٔ نشانی"
 
-#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/e-util/e-webdav-browser.c:521
 msgid "Events"
 msgstr "رویدادها"
 
-#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
-#: ../src/mail/em-folder-tree-model.c:1932
+#: ../src/e-util/e-webdav-browser.c:594 ../src/mail/em-folder-tree-model.c:1587
+#: ../src/mail/em-folder-tree-model.c:1975
 msgid "Loading…"
 msgstr "در حال بار کردن…"
 
-#: ../src/e-util/e-webdav-browser.c:1387
+#: ../src/e-util/e-webdav-browser.c:1447
 msgid "Searching collection children…"
-msgstr "جست‌وجو برای فرزندان مجموعه"
+msgstr "جست‌وجو برای فرزندان مجموعه…"
 
-#: ../src/e-util/e-webdav-browser.c:1389
+#: ../src/e-util/e-webdav-browser.c:1449
 msgid "Failed to search for collection children"
 msgstr "شکست در جست‌وجو برای فرزندان مجموعه"
 
-#: ../src/e-util/e-webdav-browser.c:1423
+#: ../src/e-util/e-webdav-browser.c:1483
 msgid "Searching for user home, please wait…"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1425
+#: ../src/e-util/e-webdav-browser.c:1485
 #, fuzzy
 #| msgid "Failed to send username to server"
 msgid "Failed to search for user home"
 msgstr "ارسال نام کاربر به کارساز شکست خورد"
 
-#: ../src/e-util/e-webdav-browser.c:1768
+#: ../src/e-util/e-webdav-browser.c:1874
 msgid "At least one component type should be set"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:1787
+#: ../src/e-util/e-webdav-browser.c:1893
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to get selected collection HREF"
 msgstr "ناتوان در حذف آشنا"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1926
 #, fuzzy
 #| msgid "Failed to retrieve message"
 msgid "Failed to save changes"
 msgstr "بازیابی پیام شکست خورد"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1928
 msgid "Creating new book…"
 msgstr "در حال ایجاد یک دفترچهٔ جدید…"
 
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1929
 #, fuzzy
 #| msgid "Unable to create new folder `%s': %s"
 msgid "Failed to create new book"
 msgstr "ایجاد شاخهٔ جدید «%s» امکان پذیر نیست: %s"
 
-#: ../src/e-util/e-webdav-browser.c:1824
+#: ../src/e-util/e-webdav-browser.c:1931
 msgid "Creating new calendar…"
 msgstr "در حال ایجاد یک تقویم جدید…"
 
-#: ../src/e-util/e-webdav-browser.c:1825
+#: ../src/e-util/e-webdav-browser.c:1932
 #, fuzzy
 #| msgid "Create a new calendar"
 msgid "Failed to create new calendar"
 msgstr "ایجاد یک تقویم جدید"
 
-#: ../src/e-util/e-webdav-browser.c:1827
+#: ../src/e-util/e-webdav-browser.c:1934
 msgid "Creating new collection…"
 msgstr "در حال ایجاد یک مجموعهٔ جدید…"
 
-#: ../src/e-util/e-webdav-browser.c:1828
+#: ../src/e-util/e-webdav-browser.c:1935
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to create new collection"
 msgstr "ناتوان در حذف آشنا"
 
-#: ../src/e-util/e-webdav-browser.c:1967
+#: ../src/e-util/e-webdav-browser.c:2085
 msgid "It is not allowed to create book under another book or calendar"
 msgstr ""
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:1969
+#: ../src/e-util/e-webdav-browser.c:2087
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr ""
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2334
 msgid "Deleting book…"
 msgstr "در حال حذف دفترچه…"
 
-#: ../src/e-util/e-webdav-browser.c:2199
+#: ../src/e-util/e-webdav-browser.c:2335
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete book"
 msgstr "ناتوان در حذف آشنا"
 
-#: ../src/e-util/e-webdav-browser.c:2202
+#: ../src/e-util/e-webdav-browser.c:2338
 msgid "Deleting calendar…"
 msgstr "در حال حذف تقویم…"
 
-#: ../src/e-util/e-webdav-browser.c:2203
+#: ../src/e-util/e-webdav-browser.c:2339
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete calendar"
 msgstr "ناتوان در حذف آشنا"
 
-#: ../src/e-util/e-webdav-browser.c:2206
+#: ../src/e-util/e-webdav-browser.c:2342
 msgid "Deleting collection…"
 msgstr "در حال حذف مجموعه…"
 
-#: ../src/e-util/e-webdav-browser.c:2207
+#: ../src/e-util/e-webdav-browser.c:2343
 #, fuzzy
 #| msgid "Failed to delete contact"
 msgid "Failed to delete collection"
 msgstr "ناتوان در حذف آشنا"
 
-#: ../src/e-util/e-webdav-browser.c:2438
+#. Translators: It's 'order' as 'sorting order'
+#: ../src/e-util/e-webdav-browser.c:2577
+#, fuzzy
+#| msgid "_Border:"
+msgid "_Order:"
+msgstr "_حاشیه:"
+
+#: ../src/e-util/e-webdav-browser.c:2587
+msgid "Use -1 to not set the sort order"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2593
 msgid "For Components:"
 msgstr "برای اجزا:"
 
-#: ../src/e-util/e-webdav-browser.c:2444
+#: ../src/e-util/e-webdav-browser.c:2599
 msgid "_Events"
 msgstr "_رویدادها"
 
-#: ../src/e-util/e-webdav-browser.c:2634
+#: ../src/e-util/e-webdav-browser.c:2792
 msgid "WebDAV server:"
 msgstr "کارساز LDAP:"
 
-#: ../src/e-util/e-webdav-browser.c:2669
+#: ../src/e-util/e-webdav-browser.c:2827
 msgid "Create _Book"
 msgstr "ایجاد _دفترچه"
 
-#: ../src/e-util/e-webdav-browser.c:2676
+#: ../src/e-util/e-webdav-browser.c:2834
 msgid "Create _Calendar"
 msgstr "ایجاد _تقویم"
 
-#: ../src/e-util/e-webdav-browser.c:2683
+#: ../src/e-util/e-webdav-browser.c:2841
 msgid "Create Collectio_n"
 msgstr "ایجاد _مجموعه"
 
-#: ../src/e-util/e-web-view.c:408
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_رونوشت از مکان پیوند"
 
-#: ../src/e-util/e-web-view.c:410
+#: ../src/e-util/e-web-view.c:408
 #, fuzzy
 #| msgid "Copy selection to clipboard"
 msgid "Copy the link to the clipboard"
 msgstr "رونوشت از متن انتخاب شده در تخته‌گیره"
 
-#: ../src/e-util/e-web-view.c:418
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "_باز کردن پیوند در مرورگر"
 
-#: ../src/e-util/e-web-view.c:420
+#: ../src/e-util/e-web-view.c:418
 #, fuzzy
 #| msgid "_Open Link in Browser"
 msgid "Open the link in a web browser"
 msgstr "_باز کردن پیوند در مرورگر"
 
-#: ../src/e-util/e-web-view.c:428
+#: ../src/e-util/e-web-view.c:426
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "_Copy Email Address"
 msgstr "رونوشت از نشانی _رایانامه"
 
-#: ../src/e-util/e-web-view.c:435
+#: ../src/e-util/e-web-view.c:433
 #, fuzzy
 #| msgid "Copy _Email Address"
 msgid "Copy _Raw Email Address"
 msgstr "رونوشت از نشانی _رایانامه"
 
-#: ../src/e-util/e-web-view.c:437
+#: ../src/e-util/e-web-view.c:435
 #, fuzzy
 #| msgid "Copy the email address to the clipboard"
 msgid "Copy the raw email address to the clipboard"
 msgstr "رونوشت از نشانی‌های رایانامه در تخته‌گیره"
 
-#: ../src/e-util/e-web-view.c:452
+#: ../src/e-util/e-web-view.c:450
 #, fuzzy
 #| msgid "_Load Images"
 msgid "_Copy Image"
 msgstr "_بار کردن تصاویر"
 
-#: ../src/e-util/e-web-view.c:454
+#: ../src/e-util/e-web-view.c:452
 #, fuzzy
 #| msgid "Copy selected messages to the clipboard"
 msgid "Copy the image to the clipboard"
 msgstr "رونوشت از پیام‌های انتخاب شده در تخته‌گیره"
 
-#: ../src/e-util/e-web-view.c:459
+#: ../src/e-util/e-web-view.c:457
 msgid "Save _Image…"
 msgstr "_ذخیرهٔ _تصویر…"
 
-#: ../src/e-util/e-web-view.c:461
+#: ../src/e-util/e-web-view.c:459
 #, fuzzy
 #| msgid "Save the current file"
 msgid "Save the image to a file"
 msgstr "ذخیرهٔ پروندهٔ فعلی"
 
-#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:201
-#: ../src/mail/e-mail-reader.c:2819
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2859
 msgid "Search _Web…"
 msgstr "جست‌وجوی _وب…"
 
-#: ../src/e-util/e-web-view.c:478 ../src/mail/e-mail-browser.c:203
-#: ../src/mail/e-mail-reader.c:2821
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2861
 #, fuzzy
 #| msgid "Send a message to the selected contacts."
 msgid "Search the Web with the selected text"
 msgstr "ارسال پیام به آشنا‌های انتخاب شده"
 
-#: ../src/e-util/e-web-view.c:488 ../src/e-util/e-web-view.c:2066
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2077
 #, fuzzy
 #| msgid "Select all the text in a message"
 msgid "Select all text and images"
 msgstr "انتخاب همهٔ متن پیام"
 
-#: ../src/e-util/e-web-view.c:1673
-#, fuzzy, c-format
-#| msgid "Click to mail %s"
-msgid "Click to call %s"
-msgstr "برای فرستادن نامه به %s کلیک کنید"
-
-#: ../src/e-util/e-web-view.c:1675
-msgid "Click to hide/unhide addresses"
-msgstr "کلیک برای نهفتن/آشکارسازی نشانی‌ها"
-
-#: ../src/e-util/e-web-view.c:1686
-#, fuzzy, c-format
-#| msgid "Enter the recipients of the message"
-msgid "Go to the section %s of the message"
-msgstr "گیرنده‌های پیام را وارد کنید"
-
-#: ../src/e-util/e-web-view.c:1688
-#, fuzzy
-#| msgid "Enter the recipients of the message"
-msgid "Go to the beginning of the message"
-msgstr "گیرنده‌های پیام را وارد کنید"
-
-#: ../src/e-util/e-web-view.c:1692
-#, c-format
-msgid "Click to open %s"
-msgstr "برای باز کردن %s کلیک کنید"
-
-#: ../src/e-util/e-web-view.c:3773
+#: ../src/e-util/e-web-view.c:3806
 #, fuzzy
 #| msgid "Copy selected messages to the clipboard"
 msgid "Copying image to clipboard"
 msgstr "رونوشت از پیام‌های انتخاب شده در تخته‌گیره"
 
-#: ../src/e-util/e-web-view.c:3961
+#: ../src/e-util/e-web-view.c:3994
 msgid "Save Image"
 msgstr "ذخیره تصویر"
 
-#: ../src/e-util/e-web-view.c:3998
+#: ../src/e-util/e-web-view.c:4031
 #, fuzzy, c-format
 #| msgid "Saving message to folder"
 msgid "Saving image to “%s”"
 msgstr "در حال ذخیرهٔ پیام‌ها در شاخه"
 
-#: ../src/e-util/e-web-view.c:4145
+#: ../src/e-util/e-web-view.c:4181
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr ""
@@ -15565,7 +15980,7 @@ msgstr "وقتی که شما مشخص می‌کنید"
 msgid "a time relative to the current time"
 msgstr "زمانی به نسبت زمان فعلی"
 
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:98
 msgid "seconds"
 msgstr "ثانیه"
 
@@ -15643,7 +16058,7 @@ msgstr "_قواعد صافی"
 msgid "Rule Name"
 msgstr "نام قاعده"
 
-#: ../src/e-util/gal-a11y-e-cell.c:128
+#: ../src/e-util/gal-a11y-e-cell.c:125
 msgid "Table Cell"
 msgstr "خانهٔ جدول"
 
@@ -15676,11 +16091,11 @@ msgstr "سطر داخل ای‌تری حاوی این خانه را جمع می
 msgid "click"
 msgstr "کلیک"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:161
+#: ../src/e-util/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "مرتب‌سازی"
 
-#: ../src/e-util/gal-view-instance-save-as-dialog.c:293
+#: ../src/e-util/gal-view-instance-save-as-dialog.c:291
 msgid "Save Current View"
 msgstr "ذخیرهٔ نمای فعلی"
 
@@ -15709,7 +16124,9 @@ msgid "Blank Signature"
 msgstr "امضای خالی"
 
 #: ../src/e-util/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
+#, fuzzy
+#| msgid "Please provide an unique name to identify this signature."
+msgid "Please provide a unique name to identify this signature."
 msgstr "لطفاً نامی یکتا برای شناسایی این امضا وارد کنید."
 
 #: ../src/e-util/widgets.error.xml.h:6
@@ -15801,108 +16218,109 @@ msgstr "شاخهٔ نامعتبر: «%s»"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:120
-#: ../src/mail/em-folder-properties.c:1444 ../src/mail/em-folder-tree-model.c:1503
-#: ../src/mail/importers/kmail-libs.c:138
-#: ../src/modules/mail/e-mail-shell-view-private.c:1015
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
+#: ../src/mail/em-folder-properties.c:1473 ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/em-folder-tree-model.c:1533 ../src/mail/importers/kmail-libs.c:138
+#: ../src/modules/mail/e-mail-shell-view-private.c:1036
+#: ../src/modules/mail/e-mail-shell-view-private.c:1047
 msgid "Inbox"
 msgstr "دریافتی"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-tree-model.c:1497 ../src/mail/importers/kmail-libs.c:144
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-folder-tree-model.c:1503 ../src/mail/em-folder-tree-model.c:1537
+#: ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Drafts"
 msgstr "پیش‌نویس‌ها"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1507 ../src/mail/importers/kmail-libs.c:140
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/mail/em-folder-tree-model.c:1513 ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1038
 msgid "Outbox"
 msgstr "ارسالی"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1511 ../src/mail/importers/kmail-libs.c:142
-#: ../src/modules/mail/e-mail-shell-view-private.c:1019
+#: ../src/mail/em-folder-tree-model.c:1516 ../src/mail/em-folder-tree-model.c:1536
+#: ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Sent"
 msgstr "ارسال شده"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/e-mail-templates-store.c:2211 ../src/mail/em-folder-tree-model.c:1499
-#: ../src/mail/importers/kmail-libs.c:146
-#: ../src/modules/mail/e-mail-shell-view-private.c:1021
+#: ../src/mail/em-folder-tree-model.c:1505 ../src/mail/importers/kmail-libs.c:146
+#: ../src/modules/mail/e-mail-shell-view-private.c:1042
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "قالب‌ها"
 
-#: ../src/libemail-engine/e-mail-session.c:1514
+#: ../src/libemail-engine/e-mail-session.c:1504
 #, fuzzy, c-format
 #| msgid "User canceled operation."
 msgid "User cancelled operation"
 msgstr "کاربر از عملیات منصر شد"
 
-#: ../src/libemail-engine/e-mail-session.c:1575
+#: ../src/libemail-engine/e-mail-session.c:1626
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been cancelled."
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1588
+#: ../src/libemail-engine/e-mail-session.c:1646
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1789
+#: ../src/libemail-engine/e-mail-session.c:1847
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1909
+#: ../src/libemail-engine/e-mail-session.c:1967
 msgid "Looking up recipient S/MIME certificates in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:1911
+#: ../src/libemail-engine/e-mail-session.c:1969
 msgid "Looking up recipient PGP keys in address books…"
 msgstr ""
 
-#: ../src/libemail-engine/e-mail-session.c:2958
+#: ../src/libemail-engine/e-mail-session.c:3016
 #, fuzzy, c-format
 #| msgid "Creating folder `%s'"
 msgid "Waiting for “%s”"
 msgstr "در حال ایجاد شاخهٔ '%s'"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:526
+#: ../src/libemail-engine/e-mail-session-utils.c:527
 #, fuzzy
 #| msgid "No location information available."
 msgid "No mail transport service available"
 msgstr "اطلاعاتی دربارهٔ مکان موجود نیست."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:613
-#: ../src/libemail-engine/mail-ops.c:708
+#: ../src/libemail-engine/e-mail-session-utils.c:618
+#: ../src/libemail-engine/mail-ops.c:705
 #, fuzzy, c-format
 #| msgid "Moving messages to %s"
 msgid "Posting message to “%s”"
 msgstr "در حال جابه‌جایی پیام‌ها به %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:650
-#: ../src/libemail-engine/mail-ops.c:744
+#: ../src/libemail-engine/e-mail-session-utils.c:656
+#: ../src/libemail-engine/mail-ops.c:741
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "اعمال صافی‌های صادره شکست خورد: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:683
-#: ../src/libemail-engine/e-mail-session-utils.c:718
-#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/e-mail-session-utils.c:689
+#: ../src/libemail-engine/e-mail-session-utils.c:724
+#: ../src/libemail-engine/mail-ops.c:769 ../src/libemail-engine/mail-ops.c:804
 #, fuzzy, c-format
 #| msgid "Moving messages to %s"
 msgid "Storing sent message to “%s”"
 msgstr "در حال جابه‌جایی پیام‌ها به %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:707
-#: ../src/libemail-engine/mail-ops.c:796
+#: ../src/libemail-engine/e-mail-session-utils.c:713
+#: ../src/libemail-engine/mail-ops.c:793
 #, fuzzy, c-format
 #| msgid ""
 #| "Failed to append to %s: %s\n"
@@ -15914,15 +16332,15 @@ msgstr ""
 "الحاق به %s شکست خورد: %s\n"
 "در حال الحاق به شاخهٔ «ارسالی» محلی به جای آن."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:737
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/e-mail-session-utils.c:743
+#: ../src/libemail-engine/mail-ops.c:821
 #, fuzzy, c-format
 #| msgid "Failed to append to local `Sent' folder: %s"
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "الحاق به شاخهٔ «ارسالی» محلی شکست خورد: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:930
-#: ../src/libemail-engine/mail-ops.c:1020 ../src/libemail-engine/mail-ops.c:1135
+#: ../src/libemail-engine/e-mail-session-utils.c:936
+#: ../src/libemail-engine/mail-ops.c:1017 ../src/libemail-engine/mail-ops.c:1129
 #: ../src/mail/mail-send-recv.c:665
 #, fuzzy
 #| msgid "Signing message"
@@ -15935,7 +16353,7 @@ msgstr "در حال امضا کردن پیام"
 msgid "Disconnecting from “%s”"
 msgstr "در حال قطع اتصال از %s"
 
-#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1048
+#: ../src/libemail-engine/e-mail-store-utils.c:264 ../src/mail/e-mail-backend.c:1055
 #, fuzzy, c-format
 #| msgid "Reconnecting to %s"
 msgid "Reconnecting to “%s”"
@@ -15967,7 +16385,7 @@ msgstr ""
 msgid "Fetching mail from “%s”"
 msgstr "در حال آوردن نامه"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:735
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set in "
@@ -15976,7 +16394,7 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:1031
+#: ../src/libemail-engine/mail-ops.c:1028
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "در حال ارسال %Id پیام از %Idتا"
@@ -15984,57 +16402,57 @@ msgstr "در حال ارسال %Id پیام از %Idتا"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1089
+#: ../src/libemail-engine/mail-ops.c:1086
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "شکست در فرستادن یک پیام"
 msgstr[1] "شکست در فرستادن %Idتا از %Id پیام"
 
-#: ../src/libemail-engine/mail-ops.c:1095
+#: ../src/libemail-engine/mail-ops.c:1092
 msgid "Cancelled."
 msgstr "لغو شد."
 
-#: ../src/libemail-engine/mail-ops.c:1097
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Complete."
 msgstr "انجام شد."
 
-#: ../src/libemail-engine/mail-ops.c:1221
+#: ../src/libemail-engine/mail-ops.c:1215
 #, fuzzy, c-format
 #| msgid "Moving messages to %s"
 msgid "Moving messages to “%s”"
 msgstr "در حال جابه‌جایی پیام‌ها به %s"
 
-#: ../src/libemail-engine/mail-ops.c:1222
+#: ../src/libemail-engine/mail-ops.c:1216
 #, fuzzy, c-format
 #| msgid "Copying messages to %s"
 msgid "Copying messages to “%s”"
 msgstr "در حال رونوشت از پیام‌ها در %s"
 
-#: ../src/libemail-engine/mail-ops.c:1341
+#: ../src/libemail-engine/mail-ops.c:1335
 #, fuzzy, c-format
 #| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "در حال مرتب‌سازی شاخهٔ «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1469
+#: ../src/libemail-engine/mail-ops.c:1463
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr ""
 
-#: ../src/libemail-engine/mail-ops.c:1470
+#: ../src/libemail-engine/mail-ops.c:1464
 #, fuzzy, c-format
 #| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "در حال ذخیرهٔ حساب «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1545
+#: ../src/libemail-engine/mail-ops.c:1539
 #, fuzzy, c-format
 #| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "در حال خالی کردن زباله‌دان در «%s»"
 
-#: ../src/libemail-engine/mail-ops.c:1637
+#: ../src/libemail-engine/mail-ops.c:1638
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr ""
@@ -16077,7 +16495,7 @@ msgstr "پیام ارجاعی"
 msgid "Setting up Search Folder: %s"
 msgstr "در حال برپاسازی شاخهٔ جست‌وجو: %s"
 
-#: ../src/libemail-engine/mail-vfolder.c:302
+#: ../src/libemail-engine/mail-vfolder.c:303
 #, fuzzy, c-format
 #| msgid "Updating Search Folders for '%s'"
 msgid "Updating Search Folders for “%s : %s”"
@@ -16088,7 +16506,7 @@ msgstr "در حال به‌هنگام‌سازی شاخه‌های جست‌وج
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../src/libemail-engine/mail-vfolder.c:666
+#: ../src/libemail-engine/mail-vfolder.c:667
 #, c-format
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
@@ -16171,25 +16589,26 @@ msgid "Missing domain in email address"
 msgstr "استفاده از نشانی رایانامه"
 
 #: ../src/mail/e-mail-autoconfig.c:1321
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "IMAP server"
 msgstr "‏کارساز IMAP"
 
 #: ../src/mail/e-mail-autoconfig.c:1328
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "POP3 server"
 msgstr "‏کارساز POP3"
 
 #: ../src/mail/e-mail-autoconfig.c:1335
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "SMTP server"
 msgstr "کارساز SMTP"
 
-#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:871
-#: ../src/shell/e-shell-window-actions.c:878
-#: ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:921
+#: ../src/shell/e-shell-window-actions.c:928
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Close this window"
 msgstr "بستن این پنجره"
 
@@ -16207,11 +16626,11 @@ msgstr "_عقب رفتن"
 msgid "_Skip Lookup"
 msgstr "_پرش از گشتن"
 
-#: ../src/mail/e-mail-config-assistant.c:725
+#: ../src/mail/e-mail-config-assistant.c:710
 msgid "Evolution Account Assistant"
 msgstr "دستیار حساب اوولوشن"
 
-#: ../src/mail/e-mail-config-assistant.c:1032
+#: ../src/mail/e-mail-config-assistant.c:1021
 #, fuzzy
 #| msgid "Use _Default"
 msgid "_Revise Details"
@@ -16291,11 +16710,12 @@ msgid "Language for Reply and Forward attribution text"
 msgstr ""
 
 #: ../src/mail/e-mail-config-composing-page.c:524
-#: ../src/mail/em-composer-utils.c:4142 ../src/mail/mail-config.ui.h:22
+#: ../src/mail/em-composer-utils.c:4152 ../src/mail/mail-config.ui.h:22
 msgid "Start _typing at the bottom"
 msgstr ""
 
-#: ../src/mail/e-mail-config-composing-page.c:531 ../src/mail/mail-config.ui.h:23
+#: ../src/mail/e-mail-config-composing-page.c:531
+#: ../src/mail/em-composer-utils.c:4155 ../src/mail/mail-config.ui.h:23
 #, fuzzy
 #| msgid "Do not quote original message"
 msgid "_Keep signature above the original message"
@@ -16357,92 +16777,92 @@ msgstr "انجام شد"
 msgid "Checking server settings…"
 msgstr "تنظیمات چاپگر"
 
-#: ../src/mail/e-mail-config-defaults-page.c:663
+#: ../src/mail/e-mail-config-defaults-page.c:662
 #, fuzzy
 #| msgid "Local Folders"
 msgid "Special Folders"
 msgstr "شاخه‌های محلی"
 
-#: ../src/mail/e-mail-config-defaults-page.c:672
+#: ../src/mail/e-mail-config-defaults-page.c:671
 #, fuzzy
 #| msgid "Sent _Messages Folder:"
 msgid "Draft Messages _Folder:"
 msgstr "شاخهٔ پیام‌های ارسالی:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:682
+#: ../src/mail/e-mail-config-defaults-page.c:681
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for saving draft messages."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:698
+#: ../src/mail/e-mail-config-defaults-page.c:697
 msgid "Sent _Messages Folder:"
 msgstr "شاخهٔ پیام‌های ارسالی:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:726
+#: ../src/mail/e-mail-config-defaults-page.c:725
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for saving sent messages."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:752
+#: ../src/mail/e-mail-config-defaults-page.c:751
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr ""
 
-#: ../src/mail/e-mail-config-defaults-page.c:775
+#: ../src/mail/e-mail-config-defaults-page.c:774
 msgid "Archi_ve Folder:"
 msgstr "شاخهٔ _بایگانی:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1517
+#: ../src/mail/e-mail-config-defaults-page.c:784
+#: ../src/modules/mail/em-mailer-prefs.c:1831
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder to archive messages to."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:800
+#: ../src/mail/e-mail-config-defaults-page.c:799
 msgid "_Templates Folder:"
 msgstr "شاخهٔ قالب‌ها:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:810
+#: ../src/mail/e-mail-config-defaults-page.c:809
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder to use for template messages."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:832
+#: ../src/mail/e-mail-config-defaults-page.c:827
 #, fuzzy
 #| msgid "Use _Default"
 msgid "_Restore Defaults"
 msgstr "استفاده از _پیش‌گزیده"
 
-#: ../src/mail/e-mail-config-defaults-page.c:849
+#: ../src/mail/e-mail-config-defaults-page.c:844
 #, fuzzy
 #| msgid "_Copy to Folder"
 msgid "_Lookup Folders"
 msgstr "_رونوشت در شاخه"
 
-#: ../src/mail/e-mail-config-defaults-page.c:867
+#: ../src/mail/e-mail-config-defaults-page.c:862
 msgid "Use a Real Folder for _Trash:"
 msgstr "استفاده از شاخه‌ای واقعی برای _زباله:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:868
+#: ../src/mail/e-mail-config-defaults-page.c:863
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for deleted messages."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:877
+#: ../src/mail/e-mail-config-defaults-page.c:872
 msgid "Use a Real Folder for _Junk:"
 msgstr "استفاده از شاخه‌ای واقعی برای _آشغال:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:878
+#: ../src/mail/e-mail-config-defaults-page.c:873
 #, fuzzy
 #| msgid "Choose folders to post the message to."
 msgid "Choose a folder for junk messages."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
-#: ../src/mail/e-mail-config-defaults-page.c:996
+#: ../src/mail/e-mail-config-defaults-page.c:991
 msgid "Defaults"
 msgstr "پیش‌گزیده‌ها"
 
@@ -16462,7 +16882,7 @@ msgstr ""
 "می‌فرستید بیاورید."
 
 #: ../src/mail/e-mail-config-identity-page.c:580
-#: ../src/mail/e-mail-config-summary-page.c:355
+#: ../src/mail/e-mail-config-summary-page.c:348
 #, fuzzy
 #| msgid ""
 #| "Type the name by which you would like to refer to this account.\n"
@@ -16538,7 +16958,7 @@ msgid "Reply To is not a valid email"
 msgstr ""
 
 #: ../src/mail/e-mail-config-identity-page.c:970
-#: ../src/mail/e-mail-config-summary-page.c:637
+#: ../src/mail/e-mail-config-summary-page.c:630
 #, fuzzy
 #| msgid "Account cannot send e-mail"
 msgid "Account Name cannot be empty"
@@ -16558,7 +16978,7 @@ msgstr "بررسی به دنبال نامهٔ جدید"
 msgid "Check for _new messages every"
 msgstr "گشتن خودکار به دنبال نامهٔ _جدید در هر"
 
-#: ../src/mail/e-mail-config-provider-page.c:767
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "گزینه‌های دریافت"
 
@@ -16568,128 +16988,128 @@ msgstr "دریافت رایانامهی"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:379
+#: ../src/mail/e-mail-config-security-page.c:375
 #, c-format
 msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:460
-#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
+#: ../src/mail/e-mail-config-security-page.c:456
+#: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:621
+#: ../src/modules/calendar/e-calendar-preferences.c:622
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:802
+#: ../src/modules/mail/e-mail-shell-backend.c:1002
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "عمومی"
 
-#: ../src/mail/e-mail-config-security-page.c:469
+#: ../src/mail/e-mail-config-security-page.c:465
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "درخواست‌های جلسه امضا _نشود (برای سازگاری با آوت‌لوک)"
 
-#: ../src/mail/e-mail-config-security-page.c:491
+#: ../src/mail/e-mail-config-security-page.c:487
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "محرمانگی خیلی خوب (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:500
+#: ../src/mail/e-mail-config-security-page.c:496
 #, fuzzy
 #| msgid "PGP/GPG _Key ID:"
 msgid "OpenPGP _Key ID:"
 msgstr "شناسهٔ _کلید PGP/GPG:"
 
-#: ../src/mail/e-mail-config-security-page.c:531
+#: ../src/mail/e-mail-config-security-page.c:527
 msgid "Si_gning algorithm:"
 msgstr "الگوریتم _امضا:"
 
-#: ../src/mail/e-mail-config-security-page.c:547
-#: ../src/mail/e-mail-config-security-page.c:711 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:543
+#: ../src/mail/e-mail-config-security-page.c:707 ../src/mail/mail-config.ui.h:79
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:550
-#: ../src/mail/e-mail-config-security-page.c:714 ../src/mail/mail-config.ui.h:80
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:710 ../src/mail/mail-config.ui.h:80
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:553
-#: ../src/mail/e-mail-config-security-page.c:717 ../src/mail/mail-config.ui.h:81
+#: ../src/mail/e-mail-config-security-page.c:549
+#: ../src/mail/e-mail-config-security-page.c:713 ../src/mail/mail-config.ui.h:81
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:556
-#: ../src/mail/e-mail-config-security-page.c:720 ../src/mail/mail-config.ui.h:82
+#: ../src/mail/e-mail-config-security-page.c:552
+#: ../src/mail/e-mail-config-security-page.c:716 ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:572
+#: ../src/mail/e-mail-config-security-page.c:568
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "امضای _همیشگی پیام‌های صادره هنگام استفاده از این حساب"
 
-#: ../src/mail/e-mail-config-security-page.c:584
+#: ../src/mail/e-mail-config-security-page.c:580
 #, fuzzy
 #| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "امضای _همیشگی پیام‌های صادره هنگام استفاده از این حساب"
 
-#: ../src/mail/e-mail-config-security-page.c:596
+#: ../src/mail/e-mail-config-security-page.c:592
 #, fuzzy
 #| msgid "Always encrypt to _myself when sending encrypted mail"
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "رمزنگاری همیشگی برای _خود هنگام ارسال نامه‌های رمزنگاری شده"
 
-#: ../src/mail/e-mail-config-security-page.c:608
+#: ../src/mail/e-mail-config-security-page.c:604
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "ا_عتماد همیشگی به کلیدهای موجود در دسته‌کلید هنگام رمزنگاری"
 
-#: ../src/mail/e-mail-config-security-page.c:620
+#: ../src/mail/e-mail-config-security-page.c:616
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr ""
 
-#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/e-mail-config-security-page.c:640
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME امن (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:653
+#: ../src/mail/e-mail-config-security-page.c:649
 msgid "Sig_ning certificate:"
 msgstr "گواهی ام_ضا:"
 
-#: ../src/mail/e-mail-config-security-page.c:677
-#: ../src/mail/e-mail-config-security-page.c:775
+#: ../src/mail/e-mail-config-security-page.c:673
+#: ../src/mail/e-mail-config-security-page.c:771
 #, fuzzy
 #| msgid "_Select"
 msgid "Select"
 msgstr "_انتخاب"
 
-#: ../src/mail/e-mail-config-security-page.c:686
-#: ../src/mail/e-mail-config-security-page.c:784
-#: ../src/shell/e-shell-window-actions.c:967
+#: ../src/mail/e-mail-config-security-page.c:682
+#: ../src/mail/e-mail-config-security-page.c:780
+#: ../src/shell/e-shell-window-actions.c:1024
 msgid "_Clear"
 msgstr "_پاک کردن"
 
-#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:691
 msgid "Signing _algorithm:"
 msgstr "_الگوریتم امضا:"
 
-#: ../src/mail/e-mail-config-security-page.c:736
+#: ../src/mail/e-mail-config-security-page.c:732
 #, fuzzy
 #| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always sign outgoing messages when using this account"
 msgstr "امضای _همیشگی پیام‌های صادره هنگام استفاده از این حساب"
 
-#: ../src/mail/e-mail-config-security-page.c:751
+#: ../src/mail/e-mail-config-security-page.c:747
 #, fuzzy
 #| msgid "Encry_ption certificate:"
 msgid "Encryption certificate:"
 msgstr "_گواهی رمزنگاری:"
 
-#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/mail/e-mail-config-security-page.c:789
 #, fuzzy
 #| msgid "Al_ways sign outgoing messages when using this account"
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "امضای _همیشگی پیام‌های صادره هنگام استفاده از این حساب"
 
-#: ../src/mail/e-mail-config-security-page.c:805
+#: ../src/mail/e-mail-config-security-page.c:801
 #, fuzzy
 #| msgid "Always encrypt to _myself when sending encrypted mail"
 msgid "Always encrypt to myself when sending encrypted messages"
@@ -16699,57 +17119,57 @@ msgstr "رمزنگاری همیشگی برای _خود هنگام ارسال ن
 msgid "Sending Email"
 msgstr "ارسال نامه"
 
-#: ../src/mail/e-mail-config-service-page.c:501
+#: ../src/mail/e-mail-config-service-page.c:490
 msgid "Server _Type:"
 msgstr "_گونهٔ کارساز:"
 
-#: ../src/mail/e-mail-config-summary-page.c:308
+#: ../src/mail/e-mail-config-summary-page.c:301
 msgid "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 
-#: ../src/mail/e-mail-config-summary-page.c:372
+#: ../src/mail/e-mail-config-summary-page.c:365
 msgid "Personal Details"
 msgstr "جزییات شخصی"
 
-#: ../src/mail/e-mail-config-summary-page.c:381
+#: ../src/mail/e-mail-config-summary-page.c:374
 msgid "Full Name:"
 msgstr "نام کامل:"
 
-#: ../src/mail/e-mail-config-summary-page.c:395
+#: ../src/mail/e-mail-config-summary-page.c:388
 msgid "Email Address:"
 msgstr "نشانی رایانامه:"
 
-#: ../src/mail/e-mail-config-summary-page.c:409
+#: ../src/mail/e-mail-config-summary-page.c:402
 msgid "Receiving"
 msgstr "درحال دریافت"
 
-#: ../src/mail/e-mail-config-summary-page.c:421
+#: ../src/mail/e-mail-config-summary-page.c:414
 msgid "Sending"
 msgstr "درحال ارسال"
 
-#: ../src/mail/e-mail-config-summary-page.c:433
+#: ../src/mail/e-mail-config-summary-page.c:426
 msgid "Server Type:"
 msgstr "گونهٔ کارساز:"
 
-#: ../src/mail/e-mail-config-summary-page.c:454
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
+#: ../src/mail/e-mail-config-summary-page.c:447
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:658
 msgid "Server:"
 msgstr "کارساز:"
 
-#: ../src/mail/e-mail-config-summary-page.c:475
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/mail/e-mail-config-summary-page.c:468
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Username:"
 msgstr "نام کاربری:"
 
-#: ../src/mail/e-mail-config-summary-page.c:496
+#: ../src/mail/e-mail-config-summary-page.c:489
 msgid "Security:"
 msgstr "امنیت:"
 
-#: ../src/mail/e-mail-config-summary-page.c:650
+#: ../src/mail/e-mail-config-summary-page.c:643
 msgid "Cannot have both receiving and sending parts set to None"
 msgstr ""
 
-#: ../src/mail/e-mail-config-summary-page.c:806
+#: ../src/mail/e-mail-config-summary-page.c:799
 msgid "Account Summary"
 msgstr "خلاصهٔ حساب"
 
@@ -16769,73 +17189,73 @@ msgstr ""
 "برای شروع روی «جلو» کلیک کنید. "
 
 #: ../src/mail/e-mail-config-welcome-page.c:172
-#: ../src/modules/startup-wizard/e-startup-assistant.c:182
+#: ../src/modules/startup-wizard/e-startup-assistant.c:170
 msgid "Welcome"
 msgstr "خوش‌آمد"
 
-#: ../src/mail/e-mail-config-window.c:329
+#: ../src/mail/e-mail-config-window.c:305
 msgid "Account Editor"
 msgstr "ویرایش‌گر حساب"
 
-#: ../src/mail/e-mail-display.c:138
+#: ../src/mail/e-mail-display.c:141
 msgid "_Add to Address Book…"
-msgstr "_افزودن به دفترچهٔ نشانی"
+msgstr "_افزودن به دفترچهٔ نشانی…"
 
-#: ../src/mail/e-mail-display.c:145
+#: ../src/mail/e-mail-display.c:148
 msgid "_To This Address"
 msgstr "_به این نشانی"
 
-#: ../src/mail/e-mail-display.c:152
+#: ../src/mail/e-mail-display.c:155
 msgid "_From This Address"
 msgstr "_از این نشانی"
 
-#: ../src/mail/e-mail-display.c:159
+#: ../src/mail/e-mail-display.c:162
 msgid "Send _Reply To…"
-msgstr " ارسال _پاسخ به…"
+msgstr "ارسال _پاسخ به…"
 
-#: ../src/mail/e-mail-display.c:161
+#: ../src/mail/e-mail-display.c:164
 #, fuzzy
 #| msgid "Send a message to the selected contacts."
 msgid "Send a reply message to this address"
 msgstr "ارسال پیام به آشنا‌های انتخاب شده"
 
-#: ../src/mail/e-mail-display.c:168
+#: ../src/mail/e-mail-display.c:171
 #, fuzzy
 #| msgid "Create _Search Folder"
 msgid "Create Search _Folder"
 msgstr "ایجاد شاخهٔ _جست‌وجو"
 
-#: ../src/mail/e-mail-display.c:721
+#: ../src/mail/e-mail-display.c:724
 msgid "Hid_e All"
 msgstr "_نهفتن همه"
 
-#: ../src/mail/e-mail-display.c:728
+#: ../src/mail/e-mail-display.c:731
 msgid "_View Inline"
 msgstr "نمایش تورفتگی"
 
-#: ../src/mail/e-mail-display.c:735
+#: ../src/mail/e-mail-display.c:738
 #, fuzzy
 #| msgid "_View Inline"
 msgid "Vie_w All Inline"
 msgstr "نمایش تورفتگی"
 
-#: ../src/mail/e-mail-display.c:742
+#: ../src/mail/e-mail-display.c:745
 msgid "_Zoom to 100%"
 msgstr "_بزرگ‌نمایی تا ۱۰۰٪"
 
-#: ../src/mail/e-mail-display.c:744
+#: ../src/mail/e-mail-display.c:747
 #, fuzzy
 #| msgid "Reset the text to its original size"
 msgid "Zoom the image to its natural size"
 msgstr "برگرداندن متن به اندازهٔ اصلی‌اش"
 
-#: ../src/mail/e-mail-display.c:749
+#: ../src/mail/e-mail-display.c:752
 #, fuzzy
 #| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "بستن این پنجره"
 
-#: ../src/mail/e-mail-display.c:751
+#: ../src/mail/e-mail-display.c:754
 msgid "Zoom large images to not be wider than the window width"
 msgstr ""
 
@@ -16857,79 +17277,87 @@ msgstr "_ایجاد"
 msgid "Folder _name:"
 msgstr "_نام شاخه:"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:687
 #, fuzzy
 #| msgid "Folder owner"
 msgid "Folder Sort Order"
 msgstr "مالک شاخه"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:728
 #, fuzzy
 #| msgid "Close the current file"
-msgid "Reset c_urrent level"
+msgid "Reset current level"
 msgstr "بستن پروندهٔ جاری"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:729
 msgid "Reset sort order in the current level to the defaults"
 msgstr ""
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:739
 #, fuzzy
 #| msgid "Delete _all Occurrences"
-msgid "Reset _all levels"
+msgid "Reset all levels"
 msgstr "حذف _همهٔ دفعات"
 
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:740
 msgid "Reset sort order in all levels to their defaults"
 msgstr ""
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:231
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Answered"
 msgstr "پاسخ‌گرفته"
 
-#: ../src/mail/e-mail-free-form-exp.c:232
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "حذف‌شده"
 
-#: ../src/mail/e-mail-free-form-exp.c:233
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Draft"
 msgstr "پیش‌نویس"
 
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "پرچم‌دار"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Seen"
 msgstr "دیده"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "پیوست"
 
-#: ../src/mail/e-mail-free-form-exp.c:489
+#: ../src/mail/e-mail-free-form-exp.c:488
 msgctxt "ffe"
 msgid "no"
 msgstr "خیر"
 
+#: ../src/mail/e-mail-free-form-exp.c:489
+#, fuzzy
+#| msgctxt "ffe"
+#| msgid "no"
+msgctxt "ffe"
+msgid "not"
+msgstr "خیر"
+
 #: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "نادرست"
 
-#: ../src/mail/e-mail-junk-options.c:296
+#: ../src/mail/e-mail-junk-options.c:289
 msgid "Junk filtering software:"
 msgstr "برنامهٔ پالایش آشغال:"
 
-#: ../src/mail/e-mail-label-dialog.c:222
+#: ../src/mail/e-mail-label-dialog.c:214
 msgid "_Label name:"
 msgstr "نام _برچسب:"
 
@@ -16957,16 +17385,16 @@ msgstr "_رسیدگی شود"
 msgid "_Later"
 msgstr "_بعداً"
 
-#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
-#: ../src/mail/em-folder-properties.c:1141
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:913
+#: ../src/mail/em-folder-properties.c:1170
 msgid "Add Label"
 msgstr "افزودن برچسب"
 
-#: ../src/mail/e-mail-label-manager.c:220 ../src/mail/em-folder-properties.c:1168
+#: ../src/mail/e-mail-label-manager.c:204 ../src/mail/em-folder-properties.c:1197
 msgid "Edit Label"
 msgstr "ویرایش برچسب"
 
-#: ../src/mail/e-mail-label-manager.c:352
+#: ../src/mail/e-mail-label-manager.c:336
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -16976,27 +17404,33 @@ msgstr ""
 msgid "Color"
 msgstr "رنگ"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
+#: ../src/mail/e-mail-notes.c:322 ../src/mail/e-mail-notes.c:727
 msgid "Message Note"
 msgstr "یادداشت پیام"
 
-#: ../src/mail/e-mail-notes.c:660
+#: ../src/mail/e-mail-notes.c:645
 #, fuzzy
 #| msgid "Copying messages into folder %s"
 msgid "Cannot find message in its folder summary"
 msgstr "‌در حال رونوشت از پیام‌ها در شاخهٔ %s"
 
-#: ../src/mail/e-mail-notes.c:863
+#: ../src/mail/e-mail-notes.c:872
+#, fuzzy
+#| msgid "Failed to retrieve message"
+msgid "Failed to convert text to message"
+msgstr "بازیابی پیام شکست خورد"
+
+#: ../src/mail/e-mail-notes.c:886 ../src/mail/e-mail-notes.c:911
 msgid "Storing changes…"
 msgstr "در حال ذخیرهٔ تغییرات…"
 
-#: ../src/mail/e-mail-notes.c:1001
+#: ../src/mail/e-mail-notes.c:1054
 #, fuzzy
 #| msgid "_Edit message"
 msgid "Edit Message Note"
 msgstr "_ویرایش پیام"
 
-#: ../src/mail/e-mail-notes.c:1157
+#: ../src/mail/e-mail-notes.c:1209
 msgid "Retrieving message…"
 msgstr "در حال گرفتن پیام‌ها…"
 
@@ -17042,7 +17476,7 @@ msgstr "نام شاخه"
 msgid "Header Value"
 msgstr "سرصفحه"
 
-#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:137
 msgid "Headers"
 msgstr "سرنامه‌ها"
 
@@ -17051,285 +17485,285 @@ msgstr "سرنامه‌ها"
 msgid "Page %d of %d"
 msgstr "صفحهٔ %Id از %Id"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "جابه‌جایی به شاخه"
 
-#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "رونوشت در شاخه"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "_جابه‌جایی"
 
-#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "رونوشت"
 
-#: ../src/mail/e-mail-reader.c:609
+#: ../src/mail/e-mail-reader.c:618
 #, fuzzy
 #| msgid "Generating message list"
 msgid "Deleting message note…"
 msgstr "در حال تولید فهرست پیام‌ها"
 
-#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
-#: ../src/mail/e-mail-reader.c:1940
+#: ../src/mail/e-mail-reader.c:1625 ../src/mail/e-mail-reader.c:1917
+#: ../src/mail/e-mail-reader.c:1957
 #, fuzzy
 #| msgid "Do not ask me again."
 msgid "_Do not ask me again."
 msgstr "دیگر سؤال نشود."
 
-#: ../src/mail/e-mail-reader.c:1946
+#: ../src/mail/e-mail-reader.c:1963
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2150
+#: ../src/mail/e-mail-reader.c:2167
 #, fuzzy
 #| msgid "Failed to retrieve message"
 msgid "Failed to retrieve message:"
 msgstr "بازیابی پیام شکست خورد"
 
-#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
+#: ../src/mail/e-mail-reader.c:2226 ../src/mail/e-mail-reader.c:3740
 #, fuzzy, c-format
 #| msgid "Retrieving message %s"
 msgid "Retrieving message “%s”"
 msgstr "در حال بازیابی پیام %s"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2430
 msgid "A_dd Sender to Address Book"
 msgstr "ا_ضافه کردن فرستنده به دفترچهٔ نشانی"
 
-#: ../src/mail/e-mail-reader.c:2399
+#: ../src/mail/e-mail-reader.c:2432
 #, fuzzy
 #| msgid "Add Sender to Address Book"
 msgid "Add sender to address book"
 msgstr "اضافه کردن فرستنده به دفترچهٔ نشانی"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2437
 msgid "_Archive…"
 msgstr "_بایگانی…"
 
-#: ../src/mail/e-mail-reader.c:2406
+#: ../src/mail/e-mail-reader.c:2439
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "جابه‌جایی پیام‌های انتخاب شده به یک شاخهٔ دیگر"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2444
 msgid "Check for _Junk"
 msgstr "بررسی به دنبال آ_شغال"
 
-#: ../src/mail/e-mail-reader.c:2413
+#: ../src/mail/e-mail-reader.c:2446
 msgid "Filter the selected messages for junk status"
 msgstr "صافی پیام‌های انتخاب شده برای وضعیت آشغال"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2451
 msgid "Assign C_olor…"
 msgstr "تخصیص _رنگ…"
 
-#: ../src/mail/e-mail-reader.c:2420
+#: ../src/mail/e-mail-reader.c:2453
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Assign color for the selected messages"
 msgstr "احیای پیام‌های انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2458
 #, fuzzy
 #| msgid "Unselected Column"
 msgid "Unse_t Color"
 msgstr "ستون انتخاب نشده"
 
-#: ../src/mail/e-mail-reader.c:2427
+#: ../src/mail/e-mail-reader.c:2460
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Unset color for the selected messages"
 msgstr "احیای پیام‌های انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2465
 msgid "_Copy to Folder…"
 msgstr "_رونوشت در شاخه…"
 
-#: ../src/mail/e-mail-reader.c:2434
+#: ../src/mail/e-mail-reader.c:2467
 msgid "Copy selected messages to another folder"
 msgstr "رونوشت از پیام‌های انتخاب شده در یک شاخهٔ دیگر"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2472
 msgid "_Delete Message"
 msgstr "_حذف پیام"
 
-#: ../src/mail/e-mail-reader.c:2441
+#: ../src/mail/e-mail-reader.c:2474
 msgid "Mark the selected messages for deletion"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده برای حذف"
 
-#: ../src/mail/e-mail-reader.c:2446
+#: ../src/mail/e-mail-reader.c:2479
 msgid "_Add note…"
 msgstr "_افزودن یادداشت…"
 
-#: ../src/mail/e-mail-reader.c:2448
+#: ../src/mail/e-mail-reader.c:2481
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Add a note for the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2453
+#: ../src/mail/e-mail-reader.c:2486
 #, fuzzy
 #| msgid "Delete Any Items"
 msgid "Delete no_te"
 msgstr "حذف همهٔ موردی"
 
-#: ../src/mail/e-mail-reader.c:2455
+#: ../src/mail/e-mail-reader.c:2488
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Delete the note for the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2493
 msgid "_Edit note…"
 msgstr "_ویرایش یادداشت…"
 
-#: ../src/mail/e-mail-reader.c:2462
+#: ../src/mail/e-mail-reader.c:2495
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Edit a note for the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2500
 #, fuzzy
 #| msgid "Filter on Mailing _List..."
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "صافی بر حسب _فهرست نامه..."
 
-#: ../src/mail/e-mail-reader.c:2469
+#: ../src/mail/e-mail-reader.c:2502
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "ایجاد قاعده برای صافی کردن پیام‌های این فهرست پستی"
 
-#: ../src/mail/e-mail-reader.c:2474
+#: ../src/mail/e-mail-reader.c:2507
 #, fuzzy
 #| msgid "Filter on _Recipients..."
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "فهرست بر حسب _گیرندگان..."
 
-#: ../src/mail/e-mail-reader.c:2476
+#: ../src/mail/e-mail-reader.c:2509
 msgid "Create a rule to filter messages to these recipients"
 msgstr "ایجاد قاعده برای صافی پیام‌های این گیرندگان"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2514
 #, fuzzy
 #| msgid "Filter on Se_nder..."
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "صافی بر حسب فرستنده..."
 
-#: ../src/mail/e-mail-reader.c:2483
+#: ../src/mail/e-mail-reader.c:2516
 msgid "Create a rule to filter messages from this sender"
 msgstr "ایجاد قاعده برای صافی کردن پیام‌های این فرستنده"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2521
 #, fuzzy
 #| msgid "Filter on _Subject..."
 msgid "Create a Filter Rule for _Subject…"
 msgstr "صافی بر حسب مو_ضوع..."
 
-#: ../src/mail/e-mail-reader.c:2490
+#: ../src/mail/e-mail-reader.c:2523
 msgid "Create a rule to filter messages with this subject"
 msgstr "ایجاد قاعده برای صافی کردن پیام‌های این موضوع"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2528
 msgid "A_pply Filters"
 msgstr "اِ_عمال صافی‌ها"
 
-#: ../src/mail/e-mail-reader.c:2497
+#: ../src/mail/e-mail-reader.c:2530
 msgid "Apply filter rules to the selected messages"
 msgstr "اعمال قاعده‌های صافی به پیام‌های انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2535
 msgid "_Find in Message…"
 msgstr "_یافتن در پیام…"
 
-#: ../src/mail/e-mail-reader.c:2504
+#: ../src/mail/e-mail-reader.c:2537
 msgid "Search for text in the body of the displayed message"
 msgstr "جست‌وجو به دنبال متن در بدنهٔ پیام نمایش داده شده"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2542
 msgid "_Clear Flag"
 msgstr "_پاک کردن پرچم‌"
 
-#: ../src/mail/e-mail-reader.c:2511
+#: ../src/mail/e-mail-reader.c:2544
 #, fuzzy
 #| msgid "Undelete the selected messages"
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "احیای پیام‌های انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2549
 msgid "_Flag Completed"
 msgstr "_پرچم گذاشتن برای انجام شده‌ها"
 
-#: ../src/mail/e-mail-reader.c:2518
+#: ../src/mail/e-mail-reader.c:2551
 #, fuzzy
 #| msgid "Select all messages in the same thread as the selected message"
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "انتخاب همهٔ پیام‌های هم‌رشتهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2556
 msgid "Follow _Up…"
 msgstr "_پی‌گیری…"
 
-#: ../src/mail/e-mail-reader.c:2525
+#: ../src/mail/e-mail-reader.c:2558
 #, fuzzy
 #| msgid "Flag selected messages for follow-up"
 msgid "Flag the selected messages for follow-up"
 msgstr "گذاشتن پرچم برای پیام‌های انتخاب شده برای پی‌گیری"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2563
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "_پیوست شده"
 
-#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
+#: ../src/mail/e-mail-reader.c:2565 ../src/mail/e-mail-reader.c:2572
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ارجاع پیام انتخاب شده به کسی با یک پیوست"
 
-#: ../src/mail/e-mail-reader.c:2537
+#: ../src/mail/e-mail-reader.c:2570
 #, fuzzy
 #| msgid "_Forward style:"
 msgid "Forward As _Attached"
 msgstr "سبک _ارجاع:"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2577
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "_درخط"
 
-#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
+#: ../src/mail/e-mail-reader.c:2579 ../src/mail/e-mail-reader.c:2586
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "ارجاع پیام انتخاب شده در بدنهٔ یک پیام جدید"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2584
 #, fuzzy
 #| msgid "_Forward style:"
 msgid "Forward As _Inline"
 msgstr "سبک _ارجاع:"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2591
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "ن_قل قول شده"
 
-#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2593 ../src/mail/e-mail-reader.c:2600
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "ارجاع پیام انتخاب شده به صورت نقل قول شده مثل پاسخ"
 
-#: ../src/mail/e-mail-reader.c:2565
+#: ../src/mail/e-mail-reader.c:2598
 #, fuzzy
 #| msgid "_Forward style:"
 msgid "Forward As _Quoted"
 msgstr "سبک _ارجاع:"
 
-#: ../src/mail/e-mail-reader.c:2572
+#: ../src/mail/e-mail-reader.c:2605
 #, fuzzy
 #| msgid "_Label"
 msgid "_New Label"
@@ -17337,492 +17771,498 @@ msgstr "_برچسب"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2581
+#: ../src/mail/e-mail-reader.c:2614
 msgid "N_one"
 msgstr "_هیچ‌کدام"
 
-#: ../src/mail/e-mail-reader.c:2588
+#: ../src/mail/e-mail-reader.c:2621
 msgid "_Load Images"
 msgstr "_بار کردن تصاویر"
 
-#: ../src/mail/e-mail-reader.c:2590
+#: ../src/mail/e-mail-reader.c:2623
 msgid "Force images in HTML mail to be loaded"
 msgstr "اجبار به بار کردن تصاویر در نامه‌های HTML"
 
-#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
+#: ../src/mail/e-mail-reader.c:2628 ../src/mail/e-mail-reader.c:3054
 msgid "_Ignore Subthread"
 msgstr "_نادیده گرفتن زیررشته"
 
-#: ../src/mail/e-mail-reader.c:2597
+#: ../src/mail/e-mail-reader.c:2630
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
+#: ../src/mail/e-mail-reader.c:2635 ../src/mail/e-mail-reader.c:3058
 #, fuzzy
 #| msgid "Next _Thread"
 msgid "_Ignore Thread"
 msgstr "_رشتهٔ بعدی"
 
-#: ../src/mail/e-mail-reader.c:2604
+#: ../src/mail/e-mail-reader.c:2637
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2609
+#: ../src/mail/e-mail-reader.c:2642
 msgid "_Important"
 msgstr "_مهم"
 
-#: ../src/mail/e-mail-reader.c:2611
+#: ../src/mail/e-mail-reader.c:2644
 msgid "Mark the selected messages as important"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده به عنوان مهم"
 
-#: ../src/mail/e-mail-reader.c:2616
+#: ../src/mail/e-mail-reader.c:2649
 msgid "_Junk"
 msgstr "آ_شغال"
 
-#: ../src/mail/e-mail-reader.c:2618
+#: ../src/mail/e-mail-reader.c:2651
 msgid "Mark the selected messages as junk"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده به این عنوان که آشغال هستند"
 
-#: ../src/mail/e-mail-reader.c:2623
+#: ../src/mail/e-mail-reader.c:2656
 msgid "_Not Junk"
 msgstr "آشغال _نیست"
 
-#: ../src/mail/e-mail-reader.c:2625
+#: ../src/mail/e-mail-reader.c:2658
 msgid "Mark the selected messages as not being junk"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده به این عنوان که آشغال نیستند"
 
-#: ../src/mail/e-mail-reader.c:2630
+#: ../src/mail/e-mail-reader.c:2663
 msgid "_Read"
 msgstr "_خواندن"
 
-#: ../src/mail/e-mail-reader.c:2632
+#: ../src/mail/e-mail-reader.c:2665
 msgid "Mark the selected messages as having been read"
 msgstr "‌علامت‌گذاری پیام‌های انتخاب شده به این عنوان که خوانده شده‌اند"
 
-#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
+#: ../src/mail/e-mail-reader.c:2670 ../src/mail/e-mail-reader.c:3078
 #, fuzzy
 #| msgid "Could not create pipe: %s"
 msgid "Do not _Ignore Subthread"
 msgstr "ایجاد لوله مفدور نیست: %s"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2672
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
+#: ../src/mail/e-mail-reader.c:2677 ../src/mail/e-mail-reader.c:3082
 msgid "Do not _Ignore Thread"
 msgstr "نادیده _نگرفتن رشته"
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:2679
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../src/mail/e-mail-reader.c:2651
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Uni_mportant"
 msgstr "_نامهم"
 
-#: ../src/mail/e-mail-reader.c:2653
+#: ../src/mail/e-mail-reader.c:2686
 msgid "Mark the selected messages as unimportant"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده به عنوان بی‌اهمیت"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:2691
 msgid "_Unread"
 msgstr "_نخوانده"
 
-#: ../src/mail/e-mail-reader.c:2660
+#: ../src/mail/e-mail-reader.c:2693
 msgid "Mark the selected messages as not having been read"
 msgstr "علامت‌گذاری پیام‌های گزیده به عنوان خوانده‌نشده"
 
-#: ../src/mail/e-mail-reader.c:2665
+#: ../src/mail/e-mail-reader.c:2698
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 #, fuzzy
 #| msgid "_Edit as New Message..."
 msgid "_Edit as New Message…"
 msgstr "_ویرایش به صورت پیام جدید..."
 
-#: ../src/mail/e-mail-reader.c:2667
+#: ../src/mail/e-mail-reader.c:2700
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "باز کردن پیام‌های انتخاب شده در نگارشگر برای ویرایش"
 
-#: ../src/mail/e-mail-reader.c:2672
+#: ../src/mail/e-mail-reader.c:2705
 msgid "Compose _New Message"
 msgstr "نگارش پیام _جدید"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:2707
 msgid "Open a window for composing a mail message"
 msgstr "باز کردن پنجره برای نگارش یک پیام نامه‌ای"
 
-#: ../src/mail/e-mail-reader.c:2679
+#: ../src/mail/e-mail-reader.c:2712
 msgid "_Open in New Window"
 msgstr "_باز کردن در پنجرهٔ جدید"
 
-#: ../src/mail/e-mail-reader.c:2681
+#: ../src/mail/e-mail-reader.c:2714
 msgid "Open the selected messages in a new window"
 msgstr "باز کردن پیام‌های انتخاب شده در پنجرهٔ جدید"
 
-#: ../src/mail/e-mail-reader.c:2686
+#: ../src/mail/e-mail-reader.c:2719
 #, fuzzy
 #| msgid "_Move to Folder"
 msgid "_Move to Folder…"
 msgstr "_جابه‌جا کردن به شاخه"
 
-#: ../src/mail/e-mail-reader.c:2688
+#: ../src/mail/e-mail-reader.c:2721
 msgid "Move selected messages to another folder"
 msgstr "جابه‌جایی پیام‌های انتخاب شده به یک شاخهٔ دیگر"
 
-#: ../src/mail/e-mail-reader.c:2693
+#: ../src/mail/e-mail-reader.c:2726
 msgid "_Next Message"
 msgstr "پیام _بعدی"
 
-#: ../src/mail/e-mail-reader.c:2695
+#: ../src/mail/e-mail-reader.c:2728
 msgid "Display the next message"
 msgstr "نمایش پیام بعدی"
 
-#: ../src/mail/e-mail-reader.c:2700
+#: ../src/mail/e-mail-reader.c:2733
 msgid "Next _Important Message"
 msgstr "پیام م_هم بعدی"
 
-#: ../src/mail/e-mail-reader.c:2702
+#: ../src/mail/e-mail-reader.c:2735
 msgid "Display the next important message"
 msgstr "نمایش پیام مهم بعدی"
 
-#: ../src/mail/e-mail-reader.c:2707
+#: ../src/mail/e-mail-reader.c:2740
 msgid "Next _Thread"
 msgstr "_رشتهٔ بعدی"
 
-#: ../src/mail/e-mail-reader.c:2709
+#: ../src/mail/e-mail-reader.c:2742
 msgid "Display the next thread"
 msgstr "نمایش رشتهٔ بعدی"
 
-#: ../src/mail/e-mail-reader.c:2714
+#: ../src/mail/e-mail-reader.c:2747
 msgid "Next _Unread Message"
 msgstr "پیام _نخواندهٔ بعدی"
 
-#: ../src/mail/e-mail-reader.c:2716
+#: ../src/mail/e-mail-reader.c:2749
 msgid "Display the next unread message"
 msgstr "نمایش پیام نخواندهٔ بعدی"
 
-#: ../src/mail/e-mail-reader.c:2721
+#: ../src/mail/e-mail-reader.c:2754
 msgid "_Previous Message"
 msgstr "پیام _قبلی"
 
-#: ../src/mail/e-mail-reader.c:2723
+#: ../src/mail/e-mail-reader.c:2756
 msgid "Display the previous message"
 msgstr "نمایش پیام قبلی"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:2761
 msgid "Pr_evious Important Message"
 msgstr "پیام مهم _قبلی"
 
-#: ../src/mail/e-mail-reader.c:2730
+#: ../src/mail/e-mail-reader.c:2763
 msgid "Display the previous important message"
 msgstr "نمایش پیام مهم قبلی"
 
-#: ../src/mail/e-mail-reader.c:2735
+#: ../src/mail/e-mail-reader.c:2768
 #, fuzzy
 #| msgid "_Previous Message"
 msgid "Previous T_hread"
 msgstr "پیام _قبلی"
 
-#: ../src/mail/e-mail-reader.c:2737
+#: ../src/mail/e-mail-reader.c:2770
 #, fuzzy
 #| msgid "Display the previous message"
 msgid "Display the previous thread"
 msgstr "نمایش پیام قبلی"
 
-#: ../src/mail/e-mail-reader.c:2742
+#: ../src/mail/e-mail-reader.c:2775
 msgid "P_revious Unread Message"
 msgstr "پیام نخواندهٔ _قبلی"
 
-#: ../src/mail/e-mail-reader.c:2744
+#: ../src/mail/e-mail-reader.c:2777
 msgid "Display the previous unread message"
 msgstr "نمایش پیام نخواندهٔ قبلی"
 
-#: ../src/mail/e-mail-reader.c:2751
+#: ../src/mail/e-mail-reader.c:2784
 msgid "Print this message"
 msgstr "چاپ این پیام"
 
-#: ../src/mail/e-mail-reader.c:2758
+#: ../src/mail/e-mail-reader.c:2791
 msgid "Preview the message to be printed"
 msgstr "پیش‌نمایش پیامی که باید چاپ شود"
 
-#: ../src/mail/e-mail-reader.c:2763
+#: ../src/mail/e-mail-reader.c:2796
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "ارسال به نشانی _جدید"
 
-#: ../src/mail/e-mail-reader.c:2765
+#: ../src/mail/e-mail-reader.c:2798
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "ارسال پیام انتخاب شده به کسی دیگر (برگشت زدن)"
 
-#: ../src/mail/e-mail-reader.c:2770
+#: ../src/mail/e-mail-reader.c:2803
 #, fuzzy
 #| msgid "No Attachment"
 msgid "Remo_ve Attachments"
 msgstr "بدون پیوست"
 
-#: ../src/mail/e-mail-reader.c:2772
+#: ../src/mail/e-mail-reader.c:2805
 #, fuzzy
 #| msgid "Save attachments"
 msgid "Remove attachments"
 msgstr "ذخیرهٔ پیوست‌ها"
 
-#: ../src/mail/e-mail-reader.c:2777
+#: ../src/mail/e-mail-reader.c:2810
 #, fuzzy
 #| msgid "Hide S_elected Messages"
 msgid "Remove Du_plicate Messages"
 msgstr "مخفی کردن پیام‌های _انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2779
+#: ../src/mail/e-mail-reader.c:2812
 #, fuzzy
 #| msgid "Mark the selected messages for deletion"
 msgid "Checks selected messages for duplicates"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده برای حذف"
 
-#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4096
+#: ../src/mail/e-mail-reader.c:2817 ../src/mail/em-composer-utils.c:4106
 #: ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "پاسخ به _همه"
 
-#: ../src/mail/e-mail-reader.c:2786
+#: ../src/mail/e-mail-reader.c:2819
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 #, fuzzy
 #| msgid "Compose a reply to all of the recipients of the selected message"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "نگارش پاسخ برای همهٔ گیرندگان پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2791
+#: ../src/mail/e-mail-reader.c:2824
 msgid "Al_ternative Reply…"
 msgstr "پاسخ _جایگزین…"
 
-#: ../src/mail/e-mail-reader.c:2793
+#: ../src/mail/e-mail-reader.c:2826
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Choose reply options for the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4091
+#: ../src/mail/e-mail-reader.c:2831 ../src/mail/em-composer-utils.c:4101
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "پاسخ به _فهرست"
 
-#: ../src/mail/e-mail-reader.c:2800
+#: ../src/mail/e-mail-reader.c:2833
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "نگارش پاسخ برای فهرست پستی پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2805
+#: ../src/mail/e-mail-reader.c:2838
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "پاسخ به _فرستنده"
 
-#: ../src/mail/e-mail-reader.c:2807
+#: ../src/mail/e-mail-reader.c:2840
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2812
+#: ../src/mail/e-mail-reader.c:2845
+#, fuzzy
+#| msgid "Apply t_emplate"
+msgid "Repl_y with Template"
+msgstr "اِ_عمال الگو"
+
+#: ../src/mail/e-mail-reader.c:2852
 #, fuzzy
 #| msgid "Save as..."
 msgid "_Save as mbox…"
 msgstr "ذخیره به نام..."
 
-#: ../src/mail/e-mail-reader.c:2814
+#: ../src/mail/e-mail-reader.c:2854
 #, fuzzy
 #| msgid "Save the selected messages as a text file"
 msgid "Save selected messages as an mbox file"
 msgstr "ذخیرهٔ پیام‌های انتخاب شده به شکل پروندهٔ متنی"
 
-#: ../src/mail/e-mail-reader.c:2826
+#: ../src/mail/e-mail-reader.c:2866
 msgid "_Message Source"
 msgstr "منبع _پیام"
 
-#: ../src/mail/e-mail-reader.c:2828
+#: ../src/mail/e-mail-reader.c:2868
 msgid "Show the raw email source of the message"
 msgstr "نشان دادن مبدأ خام رایانامهی"
 
-#: ../src/mail/e-mail-reader.c:2840
+#: ../src/mail/e-mail-reader.c:2880
 msgid "_Undelete Message"
 msgstr "_احیای پیام"
 
-#: ../src/mail/e-mail-reader.c:2842
+#: ../src/mail/e-mail-reader.c:2882
 msgid "Undelete the selected messages"
 msgstr "احیای پیام‌های انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:2847
+#: ../src/mail/e-mail-reader.c:2887
 msgid "_Normal Size"
 msgstr "اندازهٔ _عادی"
 
-#: ../src/mail/e-mail-reader.c:2849
+#: ../src/mail/e-mail-reader.c:2889
 msgid "Reset the text to its original size"
 msgstr "برگرداندن متن به اندازهٔ اصلی‌اش"
 
-#: ../src/mail/e-mail-reader.c:2854
+#: ../src/mail/e-mail-reader.c:2894
 msgid "_Zoom In"
 msgstr "زوم به _داخل"
 
-#: ../src/mail/e-mail-reader.c:2856
+#: ../src/mail/e-mail-reader.c:2896
 msgid "Increase the text size"
 msgstr "افزایش اندازهٔ متن"
 
-#: ../src/mail/e-mail-reader.c:2863
+#: ../src/mail/e-mail-reader.c:2903
 msgid "Decrease the text size"
 msgstr "کاهش اندازهٔ متن"
 
-#: ../src/mail/e-mail-reader.c:2870
+#: ../src/mail/e-mail-reader.c:2910
 msgid "Cre_ate"
 msgstr "_ایجاد"
 
-#: ../src/mail/e-mail-reader.c:2877
+#: ../src/mail/e-mail-reader.c:2917
 msgid "Ch_aracter Encoding"
 msgstr "کد_گذاری نویسه‌ها"
 
-#: ../src/mail/e-mail-reader.c:2884
+#: ../src/mail/e-mail-reader.c:2924
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 #, fuzzy
 #| msgid "F_orward As..."
 msgid "F_orward As"
 msgstr "ا_رجاع به صورت..."
 
-#: ../src/mail/e-mail-reader.c:2891
+#: ../src/mail/e-mail-reader.c:2931
 msgid "_Label"
 msgstr "_برچسب"
 
-#: ../src/mail/e-mail-reader.c:2898
+#: ../src/mail/e-mail-reader.c:2938
 msgid "_Group Reply"
 msgstr "_پاسخ _گروهی"
 
-#: ../src/mail/e-mail-reader.c:2905
+#: ../src/mail/e-mail-reader.c:2945
 msgid "_Go To"
 msgstr "_رفتن به"
 
-#: ../src/mail/e-mail-reader.c:2912
+#: ../src/mail/e-mail-reader.c:2952
 msgid "Mar_k As"
 msgstr "_علامت‌گذاری به عنوان"
 
-#: ../src/mail/e-mail-reader.c:2919
+#: ../src/mail/e-mail-reader.c:2959
 msgid "_Message"
 msgstr "_پیام"
 
-#: ../src/mail/e-mail-reader.c:2926
+#: ../src/mail/e-mail-reader.c:2966
 #, fuzzy
 #| msgid "_Zoom In"
 msgid "_Zoom"
 msgstr "زوم به _داخل"
 
-#: ../src/mail/e-mail-reader.c:2936
+#: ../src/mail/e-mail-reader.c:2976
 #, fuzzy
 #| msgid "Search Folder from Mailing _List..."
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "شاخهٔ جست‌وجو  بر حسب فهرست _پستی..."
 
-#: ../src/mail/e-mail-reader.c:2938
+#: ../src/mail/e-mail-reader.c:2978
 #, fuzzy
 #| msgid "Create a Search Folder for this mailing list"
 msgid "Create a search folder for this mailing list"
 msgstr "ایجاد شاخهٔ جست‌وجو برای این فهرست پستی"
 
-#: ../src/mail/e-mail-reader.c:2943
+#: ../src/mail/e-mail-reader.c:2983
 #, fuzzy
 #| msgid "Search Folder from Recipients..."
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "شاخهٔ جست‌وجو  بر حسب گیرندگان..."
 
-#: ../src/mail/e-mail-reader.c:2945
+#: ../src/mail/e-mail-reader.c:2985
 #, fuzzy
 #| msgid "Create a Search Folder for these recipients"
 msgid "Create a search folder for these recipients"
 msgstr "ایجاد شاخهٔ جست‌وجو برای این گیرندگان"
 
-#: ../src/mail/e-mail-reader.c:2950
+#: ../src/mail/e-mail-reader.c:2990
 #, fuzzy
 #| msgid "Search Folder from Sen_der..."
 msgid "Create a Search Folder from Sen_der…"
 msgstr "شاخهٔ جست‌وجو  بر حسب _فرستنده..."
 
-#: ../src/mail/e-mail-reader.c:2952
+#: ../src/mail/e-mail-reader.c:2992
 #, fuzzy
 #| msgid "Create a Search Folder for this sender"
 msgid "Create a search folder for this sender"
 msgstr "ایجاد شاخهٔ جست‌وجو برای این فرستنده"
 
-#: ../src/mail/e-mail-reader.c:2957
+#: ../src/mail/e-mail-reader.c:2997
 #, fuzzy
 #| msgid "Search Folder from S_ubject..."
 msgid "Create a Search Folder from S_ubject…"
 msgstr "شاخهٔ جست‌وجو  بر حسب _موضوع..."
 
-#: ../src/mail/e-mail-reader.c:2959
+#: ../src/mail/e-mail-reader.c:2999
 #, fuzzy
 #| msgid "Create a Search Folder for this subject"
 msgid "Create a search folder for this subject"
 msgstr "ایجاد شاخهٔ جست‌وجو برای این موضوع"
 
-#: ../src/mail/e-mail-reader.c:3006
+#: ../src/mail/e-mail-reader.c:3046
 #, fuzzy
 #| msgid "Mark for Follo_w Up..."
 msgid "Mark for Follo_w Up…"
 msgstr "علامت‌گذاری برای پی‌_گیری..."
 
-#: ../src/mail/e-mail-reader.c:3022
+#: ../src/mail/e-mail-reader.c:3062
 msgid "Mark as _Important"
 msgstr "علامت‌گذاری به عنوان _مهم"
 
-#: ../src/mail/e-mail-reader.c:3026
+#: ../src/mail/e-mail-reader.c:3066
 msgid "Mark as _Junk"
 msgstr "علامت‌گذاری به عنوان آ_شغال"
 
-#: ../src/mail/e-mail-reader.c:3030
+#: ../src/mail/e-mail-reader.c:3070
 msgid "Mark as _Not Junk"
 msgstr "علامت‌گذاری به عنوان _غیر آشغال"
 
-#: ../src/mail/e-mail-reader.c:3034
+#: ../src/mail/e-mail-reader.c:3074
 msgid "Mar_k as Read"
 msgstr "علامت‌گذاری به عنوان _خوانده"
 
-#: ../src/mail/e-mail-reader.c:3046
+#: ../src/mail/e-mail-reader.c:3086
 #, fuzzy
 #| msgid "_Mark as Unimportant"
 msgid "Mark as Uni_mportant"
 msgstr "علامت‌گذاری به عنوان _بی‌اهمیت"
 
-#: ../src/mail/e-mail-reader.c:3050
+#: ../src/mail/e-mail-reader.c:3090
 msgid "Mark as _Unread"
 msgstr "علامت‌گذاری به عنوان _نخوانده"
 
-#: ../src/mail/e-mail-reader.c:3098
+#: ../src/mail/e-mail-reader.c:3142
 msgid "_Caret Mode"
 msgstr "حالت _مکان‌نما"
 
-#: ../src/mail/e-mail-reader.c:3100
+#: ../src/mail/e-mail-reader.c:3144
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "نمایش مکان‌نمای چشمک زن در بدنهٔ پیام نمایش داده شده"
 
-#: ../src/mail/e-mail-reader.c:3106
+#: ../src/mail/e-mail-reader.c:3150
 msgid "All Message _Headers"
 msgstr "همهٔ _سرنامه‌های پیام"
 
-#: ../src/mail/e-mail-reader.c:3108
+#: ../src/mail/e-mail-reader.c:3152
 msgid "Show messages with all email headers"
 msgstr "نمایش پیام‌ها با همهٔ سرنامه‌ها"
 
-#: ../src/mail/e-mail-reader.c:3692
+#: ../src/mail/e-mail-reader.c:3746
 #, fuzzy
 #| msgid "Retrieving message %s"
 msgid "Retrieving message"
 msgstr "در حال بازیابی پیام %s"
 
-#: ../src/mail/e-mail-reader.c:5062
+#: ../src/mail/e-mail-reader.c:5119
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "_ارجاع"
 
-#: ../src/mail/e-mail-reader.c:5063
+#: ../src/mail/e-mail-reader.c:5120
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "ارجاع پیام انتخاب شده به کسی"
@@ -17831,33 +18271,33 @@ msgstr "ارجاع پیام انتخاب شده به کسی"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:5082
+#: ../src/mail/e-mail-reader.c:5139
 #, fuzzy
 #| msgid "Group Items By"
 msgid "Group Reply"
 msgstr "گروه کردن موارد از روی"
 
-#: ../src/mail/e-mail-reader.c:5083
+#: ../src/mail/e-mail-reader.c:5140
 #, fuzzy
 #| msgid "Compose a reply to the mailing list of the selected message"
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "نگارش پاسخ برای فهرست پستی پیام انتخاب شده"
 
-#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5206 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "حذف"
 
-#: ../src/mail/e-mail-reader.c:5161
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../src/mail/e-mail-reader.c:5218
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Next"
 msgstr "بعدی"
 
-#: ../src/mail/e-mail-reader.c:5165
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
+#: ../src/mail/e-mail-reader.c:5222
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Previous"
 msgstr "قبلی"
 
-#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5231 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "پاسخ"
 
@@ -17897,13 +18337,13 @@ msgstr ""
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../src/mail/e-mail-reader-utils.c:1602
+#: ../src/mail/e-mail-reader-utils.c:1616
 msgid "Printing"
 msgstr "در حال چاپ"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1839
+#: ../src/mail/e-mail-reader-utils.c:1853
 #, c-format
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete it?"
@@ -17912,7 +18352,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/mail/e-mail-reader-utils.c:3023
+#: ../src/mail/e-mail-reader-utils.c:3004
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "_ذخیرهٔ پیام"
@@ -17923,13 +18363,13 @@ msgstr[1] "_ذخیرهٔ پیام‌ها"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:3044
+#: ../src/mail/e-mail-reader-utils.c:3025
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "پیام"
 msgstr[1] "پیام‌ها"
 
-#: ../src/mail/e-mail-reader-utils.c:3458
+#: ../src/mail/e-mail-reader-utils.c:3439
 msgid "Parsing message"
 msgstr "تجزیهٔ پیام"
 
@@ -17966,7 +18406,7 @@ msgid ""
 "content for this sender or used sites."
 msgstr ""
 
-#: ../src/mail/e-mail-request.c:288
+#: ../src/mail/e-mail-request.c:289
 #, fuzzy
 #| msgid "Cannot send message: service not connected."
 msgid "The message has no text content."
@@ -17984,19 +18424,19 @@ msgstr "_پاک‌سازی"
 msgid "No Title"
 msgstr "بدون عنوان"
 
-#: ../src/mail/e-mail-ui-session.c:820
+#: ../src/mail/e-mail-ui-session.c:857 ../src/mail/e-mail-ui-session.c:929
+#, c-format
+msgid "No data source found for UID “%s”"
+msgstr ""
+
+#: ../src/mail/e-mail-ui-session.c:879
 #, fuzzy, c-format
 #| msgid "Authentication failed."
 msgid "%s authentication failed"
 msgstr "تأیید هویت شکست خورد."
 
-#: ../src/mail/e-mail-ui-session.c:870
-#, c-format
-msgid "No data source found for UID “%s”"
-msgstr ""
-
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:395
+#: ../src/mail/em-composer-utils.c:397
 #, fuzzy, c-format
 #| msgid "Are you sure you want to send a message with only BCC recipients?"
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
@@ -18005,7 +18445,7 @@ msgstr[0] "آیا مطمينید که می‌خواهید پیامی تنها ب
 msgstr[1] "آیا مطمينید که می‌خواهید پیامی تنها با گیرندگان رونوشت محرمانه ارسال کنید؟"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:401
+#: ../src/mail/em-composer-utils.c:403
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This would "
@@ -18022,7 +18462,7 @@ msgstr[1] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:829
+#: ../src/mail/em-composer-utils.c:856
 msgid "Waiting for attachments to load…"
 msgstr ""
 
@@ -18030,7 +18470,7 @@ msgstr ""
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:2027
+#: ../src/mail/em-composer-utils.c:2031
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -18038,11 +18478,11 @@ msgstr ""
 "روز ${AbbrevWeekdayName}، ${Year}-${Month}-${Day} ساعت ${24Hour}:${Minute} "
 "${TimeZone}، ${Sender} نوشت:"
 
-#: ../src/mail/em-composer-utils.c:2033
+#: ../src/mail/em-composer-utils.c:2037
 msgid "-------- Forwarded Message --------"
 msgstr "-------- پیام ارجاع داده شده --------"
 
-#: ../src/mail/em-composer-utils.c:2038
+#: ../src/mail/em-composer-utils.c:2042
 msgid "-----Original Message-----"
 msgstr "-----پیام اصلی-----"
 
@@ -18057,66 +18497,66 @@ msgstr "پاسخ: %s"
 msgid "an unknown sender"
 msgstr "فرستدهٔ نامعلوم"
 
-#: ../src/mail/em-composer-utils.c:4042
+#: ../src/mail/em-composer-utils.c:4052
 msgid "Alternative Reply"
 msgstr "پاسخ جایگزین"
 
-#: ../src/mail/em-composer-utils.c:4045
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+#: ../src/mail/em-composer-utils.c:4055
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1572
 msgid "_Reply"
 msgstr "_پاسخ"
 
-#: ../src/mail/em-composer-utils.c:4058
+#: ../src/mail/em-composer-utils.c:4068
 #, fuzzy
 #| msgid "Recipients"
 msgid "Recipients:"
 msgstr "گیرندگان"
 
-#: ../src/mail/em-composer-utils.c:4086
+#: ../src/mail/em-composer-utils.c:4096
 msgid "Reply to _Sender"
 msgstr "پاسخ به _فرستنده"
 
-#: ../src/mail/em-composer-utils.c:4108
+#: ../src/mail/em-composer-utils.c:4118
 msgid "Reply style:"
 msgstr "_سبک پاسخ:"
 
-#: ../src/mail/em-composer-utils.c:4116
+#: ../src/mail/em-composer-utils.c:4126
 msgid "_Default"
 msgstr "_پیش‌گزیده"
 
-#: ../src/mail/em-composer-utils.c:4120
+#: ../src/mail/em-composer-utils.c:4130
 msgid "Attach_ment"
 msgstr "پیو_ست"
 
-#: ../src/mail/em-composer-utils.c:4124
+#: ../src/mail/em-composer-utils.c:4134
 msgid "Inline (_Outlook style)"
 msgstr ""
 
-#: ../src/mail/em-composer-utils.c:4128
+#: ../src/mail/em-composer-utils.c:4138
 msgid "_Quote"
 msgstr "_نقل‌قول"
 
-#: ../src/mail/em-composer-utils.c:4132
+#: ../src/mail/em-composer-utils.c:4142
 msgid "Do _Not Quote"
 msgstr "نقل نشود"
 
-#: ../src/mail/em-composer-utils.c:4139
+#: ../src/mail/em-composer-utils.c:4149
 #, fuzzy
 #| msgid "Format messages in _HTML"
 msgid "_Format message in HTML"
 msgstr "_قالب‌بندی پیام در HTML"
 
-#: ../src/mail/em-composer-utils.c:4149
+#: ../src/mail/em-composer-utils.c:4162
 msgid "Apply t_emplate"
 msgstr "اِ_عمال الگو"
 
-#: ../src/mail/em-composer-utils.c:4161
+#: ../src/mail/em-composer-utils.c:4174
 #, fuzzy
 #| msgid "Quote original message"
 msgid "Preserve original message S_ubject"
 msgstr "نقل قول پیام اصلی"
 
-#: ../src/mail/em-composer-utils.c:4227
+#: ../src/mail/em-composer-utils.c:4240
 #, fuzzy, c-format
 #| msgid "vFolder on _Recipients"
 msgid "one recipient"
@@ -18125,11 +18565,11 @@ msgstr[0] "شاخهٔ مجازی بر اساس _گیرندگان"
 msgstr[1] "شاخهٔ مجازی بر اساس _گیرندگان"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:4636
+#: ../src/mail/em-composer-utils.c:4684
 msgid "Posting destination"
 msgstr "مقصد پست"
 
-#: ../src/mail/em-composer-utils.c:4641
+#: ../src/mail/em-composer-utils.c:4689
 msgid "Choose folders to post the message to."
 msgstr "شاخه‌هایی را که پیام باید به آنها پست شود انتخاب کنید."
 
@@ -18180,7 +18620,7 @@ msgid "If any of the following conditions are met"
 msgstr "لطفاً از گزینه‌های زیر انتخاب کنید"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1006
 #, fuzzy
 #| msgid "Then By"
 msgid "Then"
@@ -18192,29 +18632,35 @@ msgstr "بعد از روی"
 msgid "De_scribe Filters…"
 msgstr "صافی‌های پیام"
 
-#: ../src/mail/em-filter-editor-folder-element.c:154
+#: ../src/mail/em-filter-editor-folder-element.c:151
 msgid "Select Folder"
 msgstr "انتخاب شاخه"
 
+#: ../src/mail/em-filter-mail-identity-element.c:236
+#, fuzzy
+#| msgid "Mail Accounts"
+msgid "Default Account"
+msgstr "حساب‌های نامه‌ای"
+
 #. Translators: This is in a Mail filter rule editor, part of "For account: [ Any   ]" section
-#: ../src/mail/em-filter-rule.c:940
+#: ../src/mail/em-filter-rule.c:879
 msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "هر"
 
-#: ../src/mail/em-filter-rule.c:1037
+#: ../src/mail/em-filter-rule.c:976
 #, fuzzy
 #| msgid "File _type:"
 msgid "Rul_e type:"
 msgstr "نو_ع پرونده:"
 
-#: ../src/mail/em-filter-rule.c:1055
+#: ../src/mail/em-filter-rule.c:994
 #, fuzzy
 #| msgid "_Account:"
 msgid "_For Account:"
 msgstr "_حساب:"
 
-#: ../src/mail/em-filter-rule.c:1140
+#: ../src/mail/em-filter-rule.c:1079
 #, fuzzy
 #| msgid "Needs Action"
 msgid "Add Ac_tion"
@@ -18238,26 +18684,32 @@ msgstr "استفاده از قلم‌های سفارشی"
 msgid "Use te_xt color"
 msgstr "ستون انتخاب نشده"
 
-#: ../src/mail/em-folder-properties.c:494
+#: ../src/mail/em-folder-properties.c:517
+#, fuzzy
+#| msgid "_Path:"
+msgid "Path:"
+msgstr "_مسیر:"
+
+#: ../src/mail/em-folder-properties.c:526
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "پیام‌های خوانده نشده:"
 msgstr[1] "پیام‌های خوانده نشده:"
 
-#: ../src/mail/em-folder-properties.c:505
+#: ../src/mail/em-folder-properties.c:537
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "مجموع پیام‌ها:"
 msgstr[1] "مجموع پیام‌ها:"
 
-#: ../src/mail/em-folder-properties.c:526
+#: ../src/mail/em-folder-properties.c:558
 #, fuzzy, c-format
 #| msgid "Total messages:"
 #| msgid_plural "Total messages:"
 msgid "Quota usage (%s):"
 msgstr "مجموع پیام‌ها:"
 
-#: ../src/mail/em-folder-properties.c:528
+#: ../src/mail/em-folder-properties.c:560
 #, fuzzy, c-format
 #| msgid "Total messages:"
 #| msgid_plural "Total messages:"
@@ -18266,100 +18718,100 @@ msgstr "مجموع پیام‌ها:"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:672
+#: ../src/mail/em-folder-properties.c:701
 msgid "_Send Account Override:"
 msgstr ""
 
-#: ../src/mail/em-folder-properties.c:912
+#: ../src/mail/em-folder-properties.c:941
 msgid "Archive this folder using these settings:"
 msgstr "بایگانی این شاخه با این تنظیمات:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:924
+#: ../src/mail/em-folder-properties.c:953
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "_ پاک‌سازی خودکار پیام‌های قدیمی‌تر از"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:937
+#: ../src/mail/em-folder-properties.c:966
 msgctxt "autoarchive"
 msgid "days"
 msgstr "روز"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:939
+#: ../src/mail/em-folder-properties.c:968
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "هفته"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:941
+#: ../src/mail/em-folder-properties.c:970
 msgctxt "autoarchive"
 msgid "months"
 msgstr "ماه"
 
-#: ../src/mail/em-folder-properties.c:947
+#: ../src/mail/em-folder-properties.c:976
 #, fuzzy
 #| msgid "Move selected messages to another folder"
 msgid "Move messages to the default archive _folder"
 msgstr "جابه‌جایی پیام‌های انتخاب شده به یک شاخهٔ دیگر"
 
-#: ../src/mail/em-folder-properties.c:954
+#: ../src/mail/em-folder-properties.c:983
 #, fuzzy
 #| msgid "Moving messages to %s"
 msgid "_Move messages to:"
 msgstr "در حال جابه‌جایی پیام‌ها به %s"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 #, fuzzy
 #| msgid "Create folder"
 msgid "Archive folder"
 msgstr "ایجاد شاخه"
 
-#: ../src/mail/em-folder-properties.c:958
+#: ../src/mail/em-folder-properties.c:987
 #, fuzzy
 #| msgid "Select folder to import into"
 msgid "Select folder to use for Archive"
 msgstr "انتخاب شاخه برای وارد کردن به"
 
-#: ../src/mail/em-folder-properties.c:962
+#: ../src/mail/em-folder-properties.c:991
 #, fuzzy
 #| msgid "_Delete Message"
 msgid "_Delete messages"
 msgstr "_حذف پیام"
 
-#: ../src/mail/em-folder-properties.c:1317
+#: ../src/mail/em-folder-properties.c:1346
 #, fuzzy
 #| msgid "Server _Type: "
 msgid "Server Tag"
 msgstr "نوع کارساز_:"
 
-#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1350 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "برچسب"
 
-#: ../src/mail/em-folder-properties.c:1370
+#: ../src/mail/em-folder-properties.c:1399
 #, fuzzy
 #| msgid "_Switcher Appearance"
 msgid "Appearance"
 msgstr "_ظاهر تعویض کننده"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1374
+#: ../src/mail/em-folder-properties.c:1403
 msgid "Archive"
 msgstr "بایگانی"
 
-#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
+#: ../src/mail/em-folder-properties.c:1406 ../src/mail/mail-config.ui.h:126
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "برچسب‌ها"
 
-#: ../src/mail/em-folder-properties.c:1455
+#: ../src/mail/em-folder-properties.c:1484
 msgid "Folder Properties"
 msgstr "ویژگی‌های شاخه"
 
-#: ../src/mail/em-folder-properties.c:1694
+#: ../src/mail/em-folder-properties.c:1723
 #, fuzzy
 #| msgid "Calendar Properties"
 msgid "Gathering folder properties"
@@ -18399,37 +18851,37 @@ msgstr "نام شاخه نمی‌تواند «/» داشته باشد"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:879
+#: ../src/mail/em-folder-tree.c:887
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%Iu%s)"
 
-#: ../src/mail/em-folder-tree.c:1741
+#: ../src/mail/em-folder-tree.c:1822
 msgid "Mail Folder Tree"
 msgstr "‌درخت شاخهٔ نامه"
 
-#: ../src/mail/em-folder-tree.c:2290
+#: ../src/mail/em-folder-tree.c:2371
 #, c-format
 msgid "Moving folder %s"
 msgstr "در حال جابه‌جایی شاخهٔ %s"
 
-#: ../src/mail/em-folder-tree.c:2293
+#: ../src/mail/em-folder-tree.c:2374
 #, c-format
 msgid "Copying folder %s"
 msgstr "در حال رونوشت از شاخهٔ %s"
 
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2632
+#: ../src/mail/em-folder-tree.c:2381 ../src/mail/message-list.c:2668
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "در حال جابه‌جایی پیام‌ها به شاخهٔ %s"
 
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2634
+#: ../src/mail/em-folder-tree.c:2385 ../src/mail/message-list.c:2670
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "‌در حال رونوشت از پیام‌ها در شاخهٔ %s"
 
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2404
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "نمی‌توان پیام(ها) در بالاترین مخزن رها کرد"
@@ -18439,6 +18891,16 @@ msgstr "نمی‌توان پیام(ها) در بالاترین مخزن رها 
 msgid "UNMATCHED"
 msgstr "تطبیق نیافته"
 
+#: ../src/mail/em-folder-tree-model.c:1534 ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1044
+msgid "Trash"
+msgstr "زباله‌دان"
+
+#: ../src/mail/em-folder-tree-model.c:1535 ../src/mail/filtertypes.xml.in.h:41
+#: ../src/mail/mail-config.ui.h:144 ../src/mail/vfoldertypes.xml.in.h:44
+msgid "Junk"
+msgstr "آشغال"
+
 #: ../src/mail/em-folder-utils.c:111
 #, fuzzy, c-format
 #| msgid "Moving folder %s"
@@ -18491,9 +18953,9 @@ msgstr "آ_بونه شدن فهرست"
 msgid "Subscribe To _All"
 msgstr "آ_بونه شدن فهرست"
 
-#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1890
+#: ../src/mail/em-subscription-editor.c:936 ../src/mail/em-subscription-editor.c:1883
 #: ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
 msgstr "_قطع اشتراک"
 
@@ -18510,9 +18972,9 @@ msgid "Unsubscribe From _All"
 msgstr "قطع اشتراک «%s»"
 
 #: ../src/mail/em-subscription-editor.c:1315
-#: ../src/modules/mail/e-mail-shell-view-private.c:916
-#: ../src/modules/mail/e-mail-shell-view-private.c:948
-#: ../src/modules/mail/e-mail-shell-view-private.c:992
+#: ../src/modules/mail/e-mail-shell-view-private.c:937
+#: ../src/modules/mail/e-mail-shell-view-private.c:969
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18520,87 +18982,87 @@ msgstr[0] "%Id خوانده نشده، "
 msgstr[1] "%Id خوانده نشده، "
 
 #: ../src/mail/em-subscription-editor.c:1319
-#: ../src/modules/mail/e-mail-shell-view-private.c:1002
+#: ../src/modules/mail/e-mail-shell-view-private.c:1023
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "در مجموع %d"
 msgstr[1] "در مجموع %d"
 
-#: ../src/mail/em-subscription-editor.c:1731
+#: ../src/mail/em-subscription-editor.c:1724
 msgid "Folder Subscriptions"
 msgstr "آبونمان‌های شاخه‌ای"
 
-#: ../src/mail/em-subscription-editor.c:1766
+#: ../src/mail/em-subscription-editor.c:1759
 msgid "_Account:"
 msgstr "_حساب:"
 
-#: ../src/mail/em-subscription-editor.c:1779
+#: ../src/mail/em-subscription-editor.c:1772
 #, fuzzy
 #| msgid "Always Search"
 msgid "Clear Search"
 msgstr "همیشه جست‌وجو شود"
 
-#: ../src/mail/em-subscription-editor.c:1796
+#: ../src/mail/em-subscription-editor.c:1789
 msgid "Sho_w items that contain:"
 msgstr "_نمایش موارد شامل:"
 
-#: ../src/mail/em-subscription-editor.c:1843
+#: ../src/mail/em-subscription-editor.c:1836
 #, fuzzy
 #| msgid "Subscribe to Other User's Folder"
 msgid "Subscribe to the selected folder"
 msgstr "مشترک شدن شاخهٔ کاربران دیگر"
 
-#: ../src/mail/em-subscription-editor.c:1844
+#: ../src/mail/em-subscription-editor.c:1837
 #, fuzzy
 #| msgid "Subscribe"
 msgid "Su_bscribe"
 msgstr "مشترک شدن"
 
-#: ../src/mail/em-subscription-editor.c:1889
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/mail/em-subscription-editor.c:1882
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 #, fuzzy
 #| msgid "Rename the selected folder"
 msgid "Unsubscribe from the selected folder"
 msgstr "تغییر نام شاخهٔ انتخاب شده"
 
-#: ../src/mail/em-subscription-editor.c:1929
+#: ../src/mail/em-subscription-editor.c:1922
 #, fuzzy
 #| msgid "Collapse All _Threads"
 msgid "Collapse all folders"
 msgstr "جمع کردن همهٔ _رشته‌ها"
 
-#: ../src/mail/em-subscription-editor.c:1930
+#: ../src/mail/em-subscription-editor.c:1923
 #, fuzzy
 #| msgid "Collapse All _Threads"
 msgid "C_ollapse All"
 msgstr "جمع کردن همهٔ _رشته‌ها"
 
-#: ../src/mail/em-subscription-editor.c:1940
+#: ../src/mail/em-subscription-editor.c:1933
 #, fuzzy
 #| msgid "E_xpand All Threads"
 msgid "Expand all folders"
 msgstr "_باز کردن همهٔ رشته‌ها"
 
-#: ../src/mail/em-subscription-editor.c:1941
+#: ../src/mail/em-subscription-editor.c:1934
 #, fuzzy
 #| msgid "E_xpand All Threads"
 msgid "E_xpand All"
 msgstr "_باز کردن همهٔ رشته‌ها"
 
-#: ../src/mail/em-subscription-editor.c:1951
+#: ../src/mail/em-subscription-editor.c:1944
 #, fuzzy
 #| msgid "Refresh List of Folders"
 msgid "Refresh the folder list"
 msgstr "نوسازی فهرست شاخه‌ها"
 
-#: ../src/mail/em-subscription-editor.c:1963
+#: ../src/mail/em-subscription-editor.c:1956
 #, fuzzy
 #| msgid "Cancel the current mail operation"
 msgid "Stop the current operation"
 msgstr "انصراف از عملیات نامه‌ای فعلی"
 
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1957
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_توقف"
@@ -18620,24 +19082,24 @@ msgstr[1] "مطمئنید می‌خواهید %Id پیام را هم‌زمان
 msgid "Message Filters"
 msgstr "صافی‌های پیام"
 
-#: ../src/mail/em-utils.c:1014
+#: ../src/mail/em-utils.c:1022
 #, c-format
 msgid "Messages from %s"
 msgstr "پیام‌های دریافتی از %s"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1575
+#: ../src/mail/em-utils.c:1626
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "پاسخ"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1578
+#: ../src/mail/em-utils.c:1629
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1878
+#: ../src/mail/em-utils.c:1929
 #, fuzzy
 #| msgid "_Delete Message"
 msgid "Deleting old messages"
@@ -18647,47 +19109,47 @@ msgstr "_حذف پیام"
 msgid "Search _Folders"
 msgstr "شاخه‌های _جست‌وجو"
 
-#: ../src/mail/em-vfolder-editor-rule.c:404
+#: ../src/mail/em-vfolder-editor-rule.c:401
 #, fuzzy
 #| msgid "Folder"
 msgid "Add Folder"
 msgstr "شاخه"
 
-#: ../src/mail/em-vfolder-editor-rule.c:533
+#: ../src/mail/em-vfolder-editor-rule.c:530
 #, fuzzy
 #| msgid "Search Folder source"
 msgid "Search Folder Sources"
 msgstr "منبع شاخهٔ جست‌وجو"
 
-#: ../src/mail/em-vfolder-editor-rule.c:565
+#: ../src/mail/em-vfolder-editor-rule.c:562
 msgid "Automatically update on any _source folder change"
 msgstr ""
 
-#: ../src/mail/em-vfolder-editor-rule.c:577
+#: ../src/mail/em-vfolder-editor-rule.c:574
 #, fuzzy
 #| msgid "with all local folders"
 msgid "All local folders"
 msgstr "با همهٔ شاخه‌های محلی"
 
-#: ../src/mail/em-vfolder-editor-rule.c:578
+#: ../src/mail/em-vfolder-editor-rule.c:575
 #, fuzzy
 #| msgid "with all active remote folders"
 msgid "All active remote folders"
 msgstr "با همهٔ شاخه‌های دوردست فعال"
 
-#: ../src/mail/em-vfolder-editor-rule.c:579
+#: ../src/mail/em-vfolder-editor-rule.c:576
 #, fuzzy
 #| msgid "with all local and active remote folders"
 msgid "All local and active remote folders"
 msgstr "با همهٔ شاخه‌های محلی و دوردست فعال"
 
-#: ../src/mail/em-vfolder-editor-rule.c:580
+#: ../src/mail/em-vfolder-editor-rule.c:577
 #, fuzzy
 #| msgid "specific folders only"
 msgid "Specific folders"
 msgstr "فقط شاخه‌های به‌خصوص"
 
-#: ../src/mail/em-vfolder-editor-rule.c:618
+#: ../src/mail/em-vfolder-editor-rule.c:615
 #, fuzzy
 #| msgid "Create subfolders"
 msgid "include subfolders"
@@ -18784,11 +19246,6 @@ msgstr "وجود ندارد"
 msgid "Message Body"
 msgstr "بدنهٔ پیام"
 
-#: ../src/mail/filtertypes.xml.in.h:23 ../src/mail/searchtypes.xml.in.h:25
-#: ../src/mail/vfoldertypes.xml.in.h:25
-msgid "Expression"
-msgstr "اصطلاح"
-
 #: ../src/mail/filtertypes.xml.in.h:24 ../src/mail/searchtypes.xml.in.h:26
 #: ../src/mail/vfoldertypes.xml.in.h:26
 #, fuzzy
@@ -18856,11 +19313,6 @@ msgstr "مهم"
 msgid "Read"
 msgstr "خوانده"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
-#: ../src/mail/vfoldertypes.xml.in.h:44
-msgid "Junk"
-msgstr "آشغال"
-
 #: ../src/mail/filtertypes.xml.in.h:42 ../src/mail/searchtypes.xml.in.h:44
 #: ../src/mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
@@ -19011,6 +19463,12 @@ msgstr "اجرای برنامه"
 msgid "Forward to"
 msgstr "ارجاع"
 
+#: ../src/mail/filtertypes.xml.in.h:81
+#, fuzzy
+#| msgid "ends with"
+msgid "with"
+msgstr "پایان می‌یابد با"
+
 #: ../src/mail/importers/elm-importer.c:174
 msgid "Importing Elm data"
 msgstr "در حال وارد کردن داده‌های Elm"
@@ -19024,7 +19482,7 @@ msgid "Import mail from Elm."
 msgstr "وارد کردن نامه از Elm."
 
 #: ../src/mail/importers/evolution-mbox-importer.c:135
-#: ../src/mail/importers/kmail-importer.c:208
+#: ../src/mail/importers/kmail-importer.c:206
 #: ../src/plugins/dbx-import/dbx-importer.c:242
 #, fuzzy
 #| msgid "Destination folder:"
@@ -19032,14 +19490,14 @@ msgid "_Destination folder:"
 msgstr "شاخهٔ مقصد:"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:141
-#: ../src/mail/importers/kmail-importer.c:214
+#: ../src/mail/importers/kmail-importer.c:212
 #: ../src/plugins/dbx-import/dbx-importer.c:248
 #: ../src/plugins/pst-import/pst-importer.c:537
 msgid "Select folder"
 msgstr "انتخاب شاخه"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:142
-#: ../src/mail/importers/kmail-importer.c:215
+#: ../src/mail/importers/kmail-importer.c:213
 #: ../src/plugins/dbx-import/dbx-importer.c:249
 #: ../src/plugins/pst-import/pst-importer.c:538
 msgid "Select folder to import into"
@@ -19066,7 +19524,7 @@ msgstr "صندوق نامهٔ برکلی (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "وارد کنندهٔ شاخه‌های با قالب صندوق نامهٔ برکلی (mbox)"
 
-#: ../src/mail/importers/kmail-importer.c:261
+#: ../src/mail/importers/kmail-importer.c:259
 #, fuzzy, c-format
 #| msgid "Address"
 msgid "%d Address"
@@ -19074,23 +19532,18 @@ msgid_plural "%d Addresses"
 msgstr[0] "نشانی"
 msgstr[1] "نشانی"
 
-#: ../src/mail/importers/kmail-importer.c:352
+#: ../src/mail/importers/kmail-importer.c:350
 #, fuzzy
 #| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
 msgstr "واردکنندهٔ اِلم به اوولوشن"
 
-#: ../src/mail/importers/kmail-importer.c:353
+#: ../src/mail/importers/kmail-importer.c:351
 #, fuzzy
 #| msgid "Import mail from Elm."
 msgid "Import mail and contacts from KMail."
 msgstr "وارد کردن نامه از Elm."
 
-#: ../src/mail/importers/kmail-libs.c:149
-#: ../src/modules/mail/e-mail-shell-view-private.c:1023
-msgid "Trash"
-msgstr "زباله‌دان"
-
 #: ../src/mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "در حال وارد کردن صندوق نامه"
@@ -19376,7 +19829,7 @@ msgstr ""
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "_کسب تکلیف هنگام ارسال پیام با خط موضوع خالی"
 
-#. Translators: 'changes' is a verb. This is whether to show a warning or not in that situation
+#. Translators:
 #: ../src/mail/mail-config.ui.h:61
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr ""
@@ -19402,7 +19855,7 @@ msgid "Use for Recipients"
 msgstr "شاخهٔ مجازی بر اساس _گیرندگان"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:873
 msgid "Account"
 msgstr "حساب"
 
@@ -19483,176 +19936,201 @@ msgid "Fix_ed Width Font:"
 msgstr "قلم _متساوی‌العرض:"
 
 #: ../src/mail/mail-config.ui.h:94
+#, fuzzy
+#| msgid "Font _Size"
+msgid "Minimum Font _Size:"
+msgstr "اندازهٔ _قلم"
+
+#. Translators: This is part of
+#: ../src/mail/mail-config.ui.h:96
+msgid "(in pixels)"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:97
 msgid "_Mark messages as read after"
 msgstr "_علامت‌گذاری پیام‌ها به عنوان خوانده پس از"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:99
 msgid "Highlight _quotations with"
 msgstr "پررنگ کردن نقل _قول‌ها با"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:100
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Pick a color"
 msgstr "یک رنگ انتخاب کنید"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:101
 msgid "color"
 msgstr "رنگ"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:102
 msgid "Default character e_ncoding:"
 msgstr "_کدگذاری پیش‌گزیدهٔ نویسه‌ها:"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:103
 msgid "Apply the same _view settings to all folders"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:104
 #, fuzzy
 #| msgid "Fall back to threading messages by sub_ject"
 msgid "F_all back to threading messages by subject"
 msgstr "برگشت به رشته کردن پیام‌ها از روی مو_ضوع"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:105
 #, fuzzy
 #| msgid "_Delete all"
 msgid "Delete Mail"
 msgstr "_حذف همه"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:106
 #, fuzzy
 #| msgid "Empty trash folders on e_xit"
 msgid "Empty _trash folders"
 msgstr "خالی کردن شاخه‌های زباله‌دان هنگام _خروج"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:107
 msgid "Confirm _when expunging a folder"
 msgstr "تأیید گرفتن _هنگام پاک‌سازی یک شاخه"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:108
 #, fuzzy
 #| msgid "Confirm _when expunging a folder"
 msgid "Confirm when emptying a _Junk folder"
 msgstr "تأیید گرفتن _هنگام پاک‌سازی یک شاخه"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:109
 #, fuzzy
 #| msgid "Mark the selected messages for deletion"
 msgid "Go to the previ_ous message after message deletion"
 msgstr "علامت‌گذاری پیام‌های انتخاب شده برای حذف"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:110
 msgid "Archive Mail"
 msgstr "بایگانی نامه"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:111
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:112
 msgid "On This Computer A_rchive folder:"
 msgstr "شاخهٔ _بایگانی در این رایانه:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Show animated images"
 msgstr "_نمایش تصاویر متحرک‌"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:115
 #, fuzzy
 #| msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_کسب تکلیف هنگام ارسال پیام‌های HTML برای آشنایانی که نمی‌خواهند"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:116
 #, fuzzy
 #| msgid "Loading memos"
 msgid "Loading Remote Content"
 msgstr "در حال بار کردن یادداشت‌ها"
 
-#: ../src/mail/mail-config.ui.h:114
+#: ../src/mail/mail-config.ui.h:117
 #, fuzzy
 #| msgid "_Never load images from the Internet"
 msgid "_Never load remote content from the Internet"
 msgstr "تصاویر _هیچ‌وقت از اینترنت بار نشوند"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:118
 #, fuzzy
 #| msgid "_Load images in mail from contacts"
 msgid "_Load remote content only in messages from contacts"
 msgstr "با_ر کردن تصاویر در نامه از آشنایان"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:119
 #, fuzzy
 #| msgid "_Always load images from the Internet"
 msgid "_Always load remote content from the Internet"
 msgstr "تصاویر _همیشه از اینترنت بار شوند"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:120
 #, fuzzy
 #| msgid "Show the raw email source of the message"
 msgid "Notify about _missing remote content in the message preview"
 msgstr "نشان دادن مبدأ خام رایانامهی"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:121
 #, fuzzy
 #| msgid "_Add"
 msgid "Add"
 msgstr "ا_ضافه شود"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:122
 msgid "Remove"
 msgstr "حذف"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:123
 msgid "Allow for sites:"
 msgstr "اجازه برای پایگاه‌ها:"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:124
 msgid "Allow for senders:"
 msgstr "اجازه برای فرستندگان:"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:125
 #, fuzzy
 #| msgid "Messages"
 msgid "HTML Messages"
 msgstr "پیام‌ها"
 
-#: ../src/mail/mail-config.ui.h:124
+#: ../src/mail/mail-config.ui.h:127
 #, fuzzy
 #| msgid "Sender contains"
 msgid "Sender Photograph"
 msgstr "فرستنده حاوی"
 
-#: ../src/mail/mail-config.ui.h:125
+#: ../src/mail/mail-config.ui.h:128
 #, fuzzy
 #| msgid "Show the raw email source of the message"
 msgid "_Show the photograph of sender in the message preview"
 msgstr "نشان دادن مبدأ خام رایانامهی"
 
-#: ../src/mail/mail-config.ui.h:126
-msgid "Search gra_vatar.com for the photograph of sender"
-msgstr ""
+#: ../src/mail/mail-config.ui.h:129
+#, fuzzy
+#| msgid "Show the \"Preview\" pane"
+msgid "Search libra_vatar.org for the photograph of sender"
+msgstr "نشان دادن قاب «پیش‌نمایش»"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
 #, fuzzy
 #| msgid "All Message _Headers"
 msgid "Displayed Message Headers"
 msgstr "همهٔ _سرنامه‌های پیام"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:131
 msgid "Show _full mail addresses in message preview"
 msgstr ""
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:132
 msgid "Mail Headers Table"
 msgstr "‌جدول سرنامه‌ها"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:133
 msgid "Re_set"
 msgstr "_بازنشانی"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:134
+#, fuzzy
+#| msgid "Message Header"
+msgid "Message List User Headers"
+msgstr "سرنامهٔ پیام"
+
+#: ../src/mail/mail-config.ui.h:135
+#, fuzzy
+#| msgid "Mail Headers Table"
+msgid "Message List User Headers Table"
+msgstr "‌جدول سرنامه‌ها"
+
+#: ../src/mail/mail-config.ui.h:136
 #: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 #, fuzzy
@@ -19660,53 +20138,53 @@ msgstr "_بازنشانی"
 msgid "Date/Time Format"
 msgstr "تاریخ/زمان"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:138
 #, fuzzy
 #| msgid "Check in_coming mail for junk"
 msgid "Check incoming _messages for junk"
 msgstr "گشتن در نامه‌های _وارده به دنبال آشغال"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:139
 #, fuzzy
 #| msgid "_Delete Message"
 msgid "_Delete junk messages"
 msgstr "_حذف پیام"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:140
 #, fuzzy
 #| msgid "Junk Settings"
 msgid "Junk Test Options"
 msgstr "تنظیمات آشغال"
 
-#: ../src/mail/mail-config.ui.h:136
+#: ../src/mail/mail-config.ui.h:141
 #, fuzzy
 #| msgid "_Load images if sender is in address book"
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "بار کردن _تصاویر اگر فرستنده در دفترچهٔ نشانی من هست"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:142
 #, fuzzy
 #| msgid "List local addressbook folders"
 msgid "_Lookup in local address book only"
 msgstr "فهرست کردن شاخه‌های دفترچهٔ نشانی محلی"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:143
 #, fuzzy
 #| msgid "Check in_coming mail for junk"
 msgid "Check cu_stom headers for junk"
 msgstr "گشتن در نامه‌های _وارده به دنبال آشغال"
 
-#: ../src/mail/mail-config.ui.h:140
+#: ../src/mail/mail-config.ui.h:145
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "بدون رمزنگاری"
 
-#: ../src/mail/mail-config.ui.h:141
+#: ../src/mail/mail-config.ui.h:146
 msgid "TLS encryption"
 msgstr "رمزنگاری TLS"
 
-#: ../src/mail/mail-config.ui.h:142
+#: ../src/mail/mail-config.ui.h:147
 msgid "SSL encryption"
 msgstr "رمزنگاری SSL"
 
@@ -19981,7 +20459,7 @@ msgstr ""
 "آیا مطمئنید که می‌خواهید برای همیشه همهٔ پیام‌های حذف شده در همهٔ شاخه‌ها را پاک کنید؟"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "خالی کردن زباله‌دان"
 
@@ -20895,102 +21373,113 @@ msgstr "‌ویرایش شاخهٔ جست‌وجو"
 msgid "New Search Folder"
 msgstr "شاخهٔ جست‌وجوی جدید"
 
-#: ../src/mail/message-list.c:312
+#: ../src/mail/message-list.c:320
 msgid "Unseen"
 msgstr "ندیده"
 
-#: ../src/mail/message-list.c:313
+#: ../src/mail/message-list.c:321
 msgid "Seen"
 msgstr "دیده"
 
-#: ../src/mail/message-list.c:314
+#: ../src/mail/message-list.c:322 ../src/mail/message-list.c:324
 msgid "Answered"
 msgstr "جواب داده شده"
 
-#: ../src/mail/message-list.c:315
+#. and unread
+#: ../src/mail/message-list.c:323 ../src/mail/message-list.c:325
 msgid "Forwarded"
 msgstr "هدایت‌شده"
 
-#: ../src/mail/message-list.c:316
-msgid "Multiple Unseen Messages"
-msgstr "چند پیام ندیده"
-
-#: ../src/mail/message-list.c:317
-msgid "Multiple Messages"
-msgstr "چند پیام"
-
-#: ../src/mail/message-list.c:330
+#: ../src/mail/message-list.c:338
 msgid "Lowest"
 msgstr "کمترین"
 
-#: ../src/mail/message-list.c:331
+#: ../src/mail/message-list.c:339
 msgid "Lower"
 msgstr "کمتر"
 
-#: ../src/mail/message-list.c:335
+#: ../src/mail/message-list.c:343
 msgid "Higher"
 msgstr "بیشتر"
 
-#: ../src/mail/message-list.c:336
+#: ../src/mail/message-list.c:344
 msgid "Highest"
 msgstr "بیشترین"
 
-#: ../src/mail/message-list.c:485
+#: ../src/mail/message-list.c:493
 msgid "Generating message list"
 msgstr "در حال تولید فهرست پیام‌ها"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2154 ../src/modules/itip-formatter/itip-view.c:270
+#: ../src/mail/message-list.c:2189 ../src/modules/itip-formatter/itip-view.c:275
 msgid "Today %l:%M %p"
 msgstr "امروز %OH:%OM"
 
-#: ../src/mail/message-list.c:2163
+#: ../src/mail/message-list.c:2198
 msgid "Yesterday %l:%M %p"
 msgstr "دیروز %OH:%OM"
 
-#: ../src/mail/message-list.c:2175
+#: ../src/mail/message-list.c:2210
 msgid "%a %l:%M %p"
 msgstr "%A %OH:%OM"
 
-#: ../src/mail/message-list.c:2183
+#: ../src/mail/message-list.c:2218
 msgid "%b %d %l:%M %p"
 msgstr "%Od %B %OH:%OM"
 
-#: ../src/mail/message-list.c:2185
+#: ../src/mail/message-list.c:2220
 msgid "%b %d %Y"
 msgstr "%Od %B %Oy"
 
-#: ../src/mail/message-list.c:3311
+#: ../src/mail/message-list.c:3116 ../src/mail/message-list.etspec.h:24
+#, fuzzy
+#| msgid "Message Header"
+msgid "User Header 1"
+msgstr "سرنامهٔ پیام"
+
+#: ../src/mail/message-list.c:3117 ../src/mail/message-list.etspec.h:25
+#, fuzzy
+#| msgid "Message Header"
+msgid "User Header 2"
+msgstr "سرنامهٔ پیام"
+
+#: ../src/mail/message-list.c:3118 ../src/mail/message-list.etspec.h:26
+#, fuzzy
+#| msgid "Message Header"
+msgid "User Header 3"
+msgstr "سرنامهٔ پیام"
+
+#: ../src/mail/message-list.c:3523
 msgid "Select all visible messages"
 msgstr "انتخاب همهٔ پیام‌های مرئی"
 
-#: ../src/mail/message-list.c:4076 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4346 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "پیام‌ها"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5645
+#: ../src/mail/message-list.c:5929
 #, fuzzy
 #| msgid "Follow-Up"
 msgid "Follow-up"
 msgstr "پی‌گیری"
 
-#: ../src/mail/message-list.c:6708
+#: ../src/mail/message-list.c:6678 ../src/mail/message-list.c:7115
+msgid "Generating message list…"
+msgstr "در حال تولید فهرست پیام…"
+
+#: ../src/mail/message-list.c:6681
 msgid ""
 "No message satisfies your search criteria. Change search criteria by selecting a "
 "new Show message filter from the drop down list above or by running a new search "
 "either by clearing it with Search→Clear menu item or by changing the query above."
 msgstr ""
 
-#: ../src/mail/message-list.c:6716
+#: ../src/mail/message-list.c:6688
 msgid "There are no messages in this folder."
 msgstr "هیچ پیامی در این شاخه نیست."
 
-#: ../src/mail/message-list.c:6792
-msgid "Generating message list…"
-msgstr "در حال تولید فهرست پیام…"
-
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "پرچم‌دار"
@@ -21052,32 +21541,32 @@ msgid "Subject or Addresses contains"
 msgstr "موضوع یا فرستنده حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Recipients contain"
 msgstr "گیرنده‌ حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Message contains"
 msgstr "پیام‌ حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "Subject contains"
 msgstr "موضوع حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Sender contains"
 msgstr "فرستنده حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Body contains"
 msgstr "بدنه حاوی"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 #, fuzzy
 #| msgid "Expression"
 msgid "Free form expression"
@@ -21138,15 +21627,15 @@ msgstr "ویژگی‌های فهرست تکلیف"
 
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:80
 #: ../src/modules/accounts-window/e-collection-wizard-page.c:229
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:192
 msgid "_Back"
 msgstr "_بازگشت"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:213
 msgid "_Browse"
 msgstr "_مرور"
 
-#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:215
 msgid ""
 "Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete address "
 "books, calendars, memo lists or task lists there"
@@ -21154,7 +21643,7 @@ msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../src/modules/addressbook/autocompletion-config.c:124
-#: ../src/modules/mail/em-mailer-prefs.c:1697
+#: ../src/modules/mail/em-mailer-prefs.c:2071
 msgid "_Table column:"
 msgstr "ستون _جدول:"
 
@@ -21245,7 +21734,7 @@ msgstr "ایجاد یک دفترچهٔ نشانی جدید"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:607
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Save as vCard"
-msgstr "ذخیره به صورت کارت مجازی…"
+msgstr "ذخیره به صورت کارت مجازی"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "Co_py All Contacts To…"
@@ -21303,7 +21792,7 @@ msgid "Show properties of the selected address book"
 msgstr "تغییر ویژگی‌های شاخهٔ انتخاب شده"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:626
 #: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
@@ -21334,10 +21823,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "آشنا‌ها را از دفترچهٔ نشانی انتخاب کنید"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1383
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:640
 #: ../src/modules/calendar/e-task-shell-view-actions.c:766
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1679
 msgid "_Rename…"
 msgstr "_تغییر نام…"
 
@@ -21424,7 +21913,7 @@ msgid "Send a message to the selected contacts"
 msgstr "ارسال پیام به آشنا‌های انتخاب شده"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 #: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "اعمال"
@@ -21432,12 +21921,12 @@ msgstr "اعمال"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:684
 #: ../src/modules/calendar/e-task-shell-view-actions.c:838
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
 msgid "_Preview"
 msgstr "_پیش‌نمایش"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:701
 #: ../src/modules/calendar/e-task-shell-view-actions.c:855
 msgid "_Manage groups…"
@@ -21470,7 +21959,7 @@ msgstr "نمایش پنجرهٔ پیش‌نمایش آشنا"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:766
 #: ../src/modules/calendar/e-task-shell-view-actions.c:932
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1986
 msgid "_Classic View"
 msgstr "_نمای _کلاسیک"
 
@@ -21483,7 +21972,7 @@ msgstr "نمایش پنجرهٔ پیش‌نمایش آشنا"
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:773
 #: ../src/modules/calendar/e-task-shell-view-actions.c:939
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1993
 msgid "_Vertical View"
 msgstr "نمای _عمودی"
 
@@ -21494,17 +21983,17 @@ msgid "Show contact preview alongside the contact list"
 msgstr "نمایش پنجرهٔ پیش‌نمایش آشنا"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1817
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:790
-#: ../src/modules/calendar/e-task-shell-view-actions.c:998
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1012
 msgid "Unmatched"
 msgstr "تطبیق نیافته"
 
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1827
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:800
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 #: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "جست‌وجوی پیشرفته"
@@ -21571,7 +22060,7 @@ msgstr "ارسال _پیام برای فهرست"
 msgid "_Send Message to Contact"
 msgstr "ارسال _پیام برای آشنا"
 
-#: ../src/modules/alarm-notify/alarm-notify.c:171
+#: ../src/modules/alarm-notify/alarm-notify.c:163
 #, c-format
 msgid "Failed to launch command “%s”:"
 msgstr ""
@@ -21645,128 +22134,128 @@ msgstr "_بازگردانی داده‌های اوولوشن…"
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "پشتیبان‌سازی و بازیابی داده و تنظیمات اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:73
+#: ../src/modules/backup-restore/evolution-backup-tool.c:74
 #, fuzzy
 #| msgid "Backup Evolution directory"
 msgid "Back up Evolution directory"
 msgstr "پشتیبان‌سازی شاخهٔ اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:75
+#: ../src/modules/backup-restore/evolution-backup-tool.c:76
 msgid "Restore Evolution directory"
 msgstr "بازیابی شاخهٔ اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:77
+#: ../src/modules/backup-restore/evolution-backup-tool.c:78
 #, fuzzy
 #| msgid "Check Evolution archive"
 msgid "Check Evolution Back up"
 msgstr "بررسی آرشیو اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:79
+#: ../src/modules/backup-restore/evolution-backup-tool.c:80
 msgid "Restart Evolution"
 msgstr "راه‌اندازی مجدد اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:81
+#: ../src/modules/backup-restore/evolution-backup-tool.c:82
 msgid "With Graphical User Interface"
 msgstr ""
 
 #. FIXME Will the versioned setting always work?
-#: ../src/modules/backup-restore/evolution-backup-tool.c:294
-#: ../src/modules/backup-restore/evolution-backup-tool.c:498
+#: ../src/modules/backup-restore/evolution-backup-tool.c:516
+#: ../src/modules/backup-restore/evolution-backup-tool.c:772
 msgid "Shutting down Evolution"
 msgstr "در حال خاموش کردن اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:303
+#: ../src/modules/backup-restore/evolution-backup-tool.c:525
 #, fuzzy
 #| msgid "Backup and restore Evolution data and settings"
 msgid "Backing Evolution accounts and settings"
 msgstr "پشتیبان‌سازی و بازیابی داده و تنظیمات اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:320
+#: ../src/modules/backup-restore/evolution-backup-tool.c:540
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:336
+#: ../src/modules/backup-restore/evolution-backup-tool.c:556
 #, fuzzy
 #| msgid "_Mark as Complete"
 msgid "Back up complete"
 msgstr "علامت گذاری به عنوان انجام شده"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:343
-#: ../src/modules/backup-restore/evolution-backup-tool.c:705
+#: ../src/modules/backup-restore/evolution-backup-tool.c:563
+#: ../src/modules/backup-restore/evolution-backup-tool.c:995
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Restarting Evolution"
 msgstr "راه‌اندازی مجدد اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:504
+#: ../src/modules/backup-restore/evolution-backup-tool.c:778
 #, fuzzy
 #| msgid "Backup Evolution directory"
 msgid "Back up current Evolution data"
 msgstr "پشتیبان‌سازی شاخهٔ اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:511
+#: ../src/modules/backup-restore/evolution-backup-tool.c:785
 msgid "Extracting files from back up"
 msgstr ""
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:606
+#: ../src/modules/backup-restore/evolution-backup-tool.c:880
 #, fuzzy
 #| msgid "Change Evolution's settings"
 msgid "Loading Evolution settings"
 msgstr "تغییر تنظیمات اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:676
+#: ../src/modules/backup-restore/evolution-backup-tool.c:966
 msgid "Removing temporary back up files"
 msgstr ""
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:690
+#: ../src/modules/backup-restore/evolution-backup-tool.c:980
 msgid "Reloading registry service"
 msgstr ""
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:903
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1193
 #, fuzzy
 #| msgid "Evolution Mail"
 msgid "Evolution Back Up"
 msgstr "نامهٔ اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1194
 #, fuzzy, c-format
 #| msgid "Setting up Search Folder: %s"
 msgid "Backing up to the file %s"
 msgstr "در حال برپاسازی شاخهٔ جست‌وجو: %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:908
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1198
 #, fuzzy
 #| msgid "Evolution Test"
 msgid "Evolution Restore"
 msgstr "آزمایش اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:909
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1199
 #, fuzzy, c-format
 #| msgid "Removing folder %s"
 msgid "Restoring from the file %s"
 msgstr "در حال حذف شاخهٔ %s"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1268
 #, fuzzy
 #| msgid "Backup Evolution directory"
 msgid "Backing up Evolution Data"
 msgstr "پشتیبان‌سازی شاخهٔ اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:979
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1269
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:981
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1271
 #, fuzzy
 #| msgid "Restart Evolution"
 msgid "Restoring Evolution Data"
 msgstr "راه‌اندازی مجدد اوولوشن"
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:982
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1272
 msgid "Please wait while Evolution is restoring your data."
 msgstr "لطفاً تا زمانی که اوولوشن داده‌هایتان را بازمی‌گرداند شکیبا باشید."
 
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1294
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -21859,161 +22348,179 @@ msgid "Junk filter using Bogofilter"
 msgstr ""
 
 #: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:93
+#: ../src/modules/book-config-google/e-google-book-chooser-button.c:207
 #, fuzzy
 #| msgid "New Address Book"
 msgid "Choose an Address Book"
 msgstr "دفترچهٔ نشانی جدید"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:268
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:281
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:312
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:333
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:144
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:301
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:322
+#: ../src/modules/itip-formatter/itip-view.c:1706
+#: ../src/modules/itip-formatter/itip-view.c:1821
 msgid "URL:"
 msgstr "نشانی اینترنتی:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:292
 msgid "Find Address Books"
 msgstr "یافتن دفترچه‌های نشانی"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:303
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:356
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:452
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:230
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:400
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr ""
 
-#: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
-#: ../src/modules/cal-config-google/e-cal-config-google.c:190
+#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
+#, fuzzy
+#| msgid "Del_ete Address Book"
+msgid "Default User Address Book"
+msgstr "ح_ذف دفترچهٔ نشانی"
+
+#: ../src/modules/book-config-google/evolution-book-config-google.c:75
+#, fuzzy
+#| msgid "Address B_ook:"
+msgid "Address Book:"
+msgstr "دفترچهٔ نشانی:"
+
+#: ../src/modules/book-config-google/evolution-book-config-google.c:100
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1066
+#: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 msgid "User name cannot be empty"
 msgstr "نام کاربری نمی‌تواند خالی باشد"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:415
 msgid "Looking up server search bases, please wait…"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:491
 msgid "Standard LDAP Port"
 msgstr "درگاه استاندارد LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:497
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:503
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:509
 msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr ""
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
 msgid "Connecting to LDAP"
 msgstr "در حال اتصال به LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
 msgid "Server Information"
 msgstr "اطلاعات کارساز"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:664
 msgid "Port:"
 msgstr "درگاه:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:672
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "StartTLS (recommended)"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Encryption:"
 msgstr "رمزنگاری:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:713
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "تأیید هویت"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:745
 msgid "Anonymous"
 msgstr "ناشناس"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Username can be left empty"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:752
 msgid "Using email address"
 msgstr "استفاده از نشانی رایانامه"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:753
 msgid "requires anonymous access to your LDAP server"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:759
 msgid "Using distinguished name (DN)"
 msgstr "استفاده از نام متمایز (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:760
 msgid "for example: uid=user,dc=example,dc=com"
 msgstr ""
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Method:"
 msgstr "روش:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid "This is the method Evolution will use to authenticate you."
 msgstr ""
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:784
 msgid "Using LDAP"
 msgstr "استفاده از LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
-#: ../src/modules/mail/e-mail-shell-view.c:118
-#: ../src/modules/mail/e-mail-shell-view.c:200
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:801
+#: ../src/modules/mail/e-mail-shell-view.c:119
+#: ../src/modules/mail/e-mail-shell-view.c:208
 msgid "Searching"
 msgstr "در حال جست‌وجو"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:823
 msgid "Search Base:"
 msgstr "پایهٔ جست‌وجو:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Find Possible Search Bases"
 msgstr "یافتن پایه‌های جست‌وجوی ممکن"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:849
 msgid "One Level"
 msgstr "یک سطح"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:851
 msgid "Subtree"
 msgstr "زیردرخت"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:853
 msgid "Search Scope:"
 msgstr "حوزهٔ جست‌وجو:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
 #, fuzzy
 #| msgid ""
 #| "The search scope defines how deep you would like the search to extend down the "
@@ -22031,27 +22538,27 @@ msgstr ""
 "گرفت. حوزهٔ جست‌وجوی «یک» تنها ورودی‌های یکی پایین‌تر از پایهٔ جست‌وجویتان را در بر "
 "خواهد گرفت."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:867
 msgid "Search Filter:"
 msgstr "پالایهٔ جست‌وجو:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
 msgid "Downloading"
 msgstr "در حال بارگیری"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:900
 msgid "Limit:"
 msgstr "کران:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:911
 msgid "contacts"
 msgstr "آشنایان"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:916
 msgid "Browse until limit is reached"
 msgstr "مرور تا زمان رسیدن به کران"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1051
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
@@ -22072,23 +22579,24 @@ msgstr "گزینش یک فهرست یادداشت"
 msgid "Choose a Task List"
 msgstr "گزینش یک فهرست تکلیف"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:348
 msgid "Find Calendars"
 msgstr "یافتن تقویم‌ها"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
 msgid "Find Memo Lists"
 msgstr "یاقتن فهرست‌های یادداشت‌ها"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:354
 msgid "Find Task Lists"
 msgstr "یافتن فهرست‌های تکلیف"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:373
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "رایانامه:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:379
 msgid "Server handles meeting invitations"
 msgstr ""
 
@@ -22096,11 +22604,11 @@ msgstr ""
 msgid "Choose which address books to use."
 msgstr ""
 
-#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:204
+#: ../src/modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "استفاده در تقویم روزهای تولد و سالگردها"
 
-#: ../src/modules/cal-config-google/e-cal-config-google.c:101
+#: ../src/modules/cal-config-google/e-cal-config-google.c:98
 msgid "Enable Calendars to synchronize"
 msgstr ""
 
@@ -22108,23 +22616,23 @@ msgstr ""
 msgid "Default User Calendar"
 msgstr "تقویم کاربر پیش‌گزیده"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:177
 msgid "Use an existing iCalendar (ics) file"
 msgstr ""
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:202
 msgid "iCalendar File"
 msgstr "پروندهٔ iCalendar"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Choose an iCalendar file"
 msgstr "گزینش یک پروندهٔ iCalendar"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:217
 msgid "File:"
 msgstr "پرونده:"
 
-#: ../src/modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../src/modules/cal-config-local/evolution-cal-config-local.c:232
 msgid "Allow Evolution to update the file"
 msgstr ""
 
@@ -22134,36 +22642,48 @@ msgstr ""
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:221
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:290
 msgid "Fahrenheit (°F)"
 msgstr "فارنهایت (‪°F‬)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:295
 msgid "Centigrade (°C)"
 msgstr "سانتی‌گراد (‪°C‬)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:299
 msgid "Kelvin (K)"
 msgstr "کلوین (K)"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:301
 msgid "Units:"
 msgstr "واحدها:"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:357
 msgid "Location cannot be empty"
 msgstr "موقعیت نمی‌تواند خالی باشد"
 
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:106
+#, fuzzy
+#| msgid "Show Fields"
+msgid "Choose Notes"
+msgstr "نمایش فیلدها"
+
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:336
+#, fuzzy
+#| msgid "_Find Now"
+msgid "Find Notes"
+msgstr "_پیدا کردن فوری"
+
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
@@ -22211,97 +22731,97 @@ msgstr "_وارد کردن به تکلیف‌ها"
 msgid "I_mport to Task List"
 msgstr "_وارد کردن به تکلیف‌ها"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, fuzzy, c-format
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Copying an event into the calendar “%s”"
 msgstr "قرار در تقویم «%s» پیدا شد"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:580
 #, fuzzy, c-format
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Moving an event into the calendar “%s”"
 msgstr "قرار در تقویم «%s» پیدا شد"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:585
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:586
 #, c-format
 msgid "Moving a memo into the memo list “%s”"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:591
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:592
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:707
 #, fuzzy
 #| msgid "Calendar Source Selector"
 msgid "Calendar Selector"
 msgstr "انتخاب‌گر مبدأ تقویم"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:713
 #, fuzzy
 #| msgid "Memo Source Selector"
 msgid "Memo List Selector"
 msgstr "انتخاب‌کنندهٔ منبع یادداشت"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:718
 #, fuzzy
 #| msgid "Task Source Selector"
 msgid "Task List Selector"
 msgstr "انتخاب‌کنندهٔ منبع تکلیف"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:521
+#: ../src/modules/calendar/e-calendar-preferences.c:522
 #, fuzzy
 #| msgid "Select the calendars for alarm notification"
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "تقویم‌های مورد استفاده برای اعلان هشدار را انتخاب کنید"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:528
+#: ../src/modules/calendar/e-calendar-preferences.c:529
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:612
+#: ../src/modules/calendar/e-calendar-preferences.c:613
 #, fuzzy
 #| msgid "Meeting Information"
 msgid "Meeting Invitations"
 msgstr "اطلاعات جلسه"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:638
+#: ../src/modules/calendar/e-calendar-preferences.c:639
 msgid "_Delete message after acting"
 msgstr "_حذف پیام بعد از کنش"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:645
+#: ../src/modules/calendar/e-calendar-preferences.c:646
 msgid "_Preserve existing reminder by default"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.c:659
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:691
 msgid "Conflict Search"
 msgstr "جست‌وجوی تداخل"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:674
+#: ../src/modules/calendar/e-calendar-preferences.c:675
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "انتخاب تقویم‌ها برای جست‌وجو به دنبال تداخل جسله‌ها"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1116
+#: ../src/modules/calendar/e-calendar-preferences.c:1128
 #, fuzzy
 #| msgid "_Due date:"
 msgid "Ti_me and date:"
 msgstr "تاریخ _سررسید:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1117
+#: ../src/modules/calendar/e-calendar-preferences.c:1129
 #, fuzzy
 #| msgid "_Date completed:"
 msgid "_Date only:"
@@ -22370,7 +22890,7 @@ msgid "_24 hour"
 msgstr "_۲۴ ساعتی"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1779
 msgid "Work Week"
 msgstr "هفتهٔ کاری"
 
@@ -22558,78 +23078,95 @@ msgstr "رسیدگی شود"
 msgid "Show Tasks without _Due date"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#. Translators: This constructs: Show [spinner] days
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#, fuzzy
+#| msgid "Show"
+msgctxt "to-do-bar-n-days"
+msgid "Show"
+msgstr "نمایش"
+
+#. Translators: This constructs: Show [spinner] days
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#, fuzzy
+#| msgctxt "cal-reminders"
+#| msgid "da_ys"
+msgctxt "to-do-bar-n-days"
+msgid "da_ys"
+msgstr "روز"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 #, fuzzy
 #| msgid "Show display alarms in notification tray"
 msgid "Display Reminders window with _notifications"
 msgstr "نشان دادن هشدارهای نمایشی در سینی اطلاع"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
 #, fuzzy
 #| msgid "Show display alarms in notification tray"
 msgid "Keep reminder notification _window always on top"
 msgstr "نشان دادن هشدارهای نمایشی در سینی اطلاع"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
 #, fuzzy
 #| msgid "Delete completed tasks"
 msgid "Display reminders for completed _tasks"
 msgstr "حذف تکلیف‌های انجام شده"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
 #, fuzzy
 #| msgid "Set or unset reminders for this event"
 msgid "Display reminders for _past events"
 msgstr "تنظیم یا بازنشانی یادآوری‌ها برای این رویداد"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 #, fuzzy
 #| msgid "Default reminder value"
 msgid "Set _default reminder"
 msgstr "مقدار یادآور پیش‌گزیده"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 #, fuzzy
 #| msgid "before every appointment"
 msgid "before every new appointment"
 msgstr "پیش از هر قرار"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 #, fuzzy
 #| msgid "Sh_ow a reminder"
 msgid "Show a _reminder"
 msgstr "نمای_ش یک یادآور"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "before every anniversary/birthday"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "Select the sources for reminder notification:"
 msgstr "گزینش منبع‌ها برای آگاهی یادآوری:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 #, fuzzy
 #| msgid "<b>Default Free/Busy Server</b>"
 msgid "Default Free/Busy Server"
 msgstr "<b>کارساز پیش‌گزیده آزاد/مشغول</b>"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:96
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%Iu و %Id با کاربر و دامنهٔ نشانی رایانامه جایگزین خواهند شد."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:97
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
 msgstr ""
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:98
 #, fuzzy
 #| msgid "Publishing Location"
 msgid "Publishing Information"
@@ -22641,7 +23178,7 @@ msgid "_Appointment"
 msgstr "_قرار ملاقات"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:120
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "Create a new appointment"
 msgstr "ایجاد یک قرار جدید"
 
@@ -22669,7 +23206,7 @@ msgid "Cale_ndar"
 msgstr "_تقویم"
 
 #: ../src/modules/calendar/e-cal-shell-backend.c:144
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Create a new calendar"
 msgstr "ایجاد یک تقویم جدید"
 
@@ -22695,7 +23232,7 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "محو رویدادهای قدیمی‌تر از"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:981
 #, fuzzy
 #| msgid "Make this Occurrence _Movable"
 msgid "Making an occurrence movable"
@@ -22703,11 +23240,11 @@ msgstr "قابل جابه‌جایی کردن این دفعه"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1174
 msgid "event"
 msgstr "رویداد"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1176
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:510
@@ -22717,182 +23254,194 @@ msgstr "رویداد"
 msgid "Save as iCalendar"
 msgstr "تقویم جدید"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:591
 #: ../src/modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Copy…"
 msgstr "_رونوشت…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
 #, fuzzy
 #| msgid "Select Calendar"
 msgid "D_elete Calendar"
 msgstr "انتخاب تقویم"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1308
 #, fuzzy
 #| msgid "Delete the selected folder"
 msgid "Delete the selected calendar"
 msgstr "حذف شاخهٔ انتخاب شده"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Go Back"
 msgstr "عقب رفتن"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Go Forward"
 msgstr "پیش‌روی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1329
 msgid "Select today"
 msgstr "انتخاب امروز"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Select _Date"
 msgstr "انتخاب تاریخ"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1336
 msgid "Select a specific date"
 msgstr "انتخاب یک تاریخ به‌خصوص"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "_Manage Calendar groups…"
 msgstr "_مدیریت گروه‌های تقویم…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Manage Calendar groups order and visibility"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_New Calendar"
 msgstr "تقویم _جدید"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
 #: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "پا_ک‌سازی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Purge old appointments and meetings"
 msgstr "پاک‌سازی جلسات و قرارهای قدیمی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1371
 #, fuzzy
 #| msgid "Rename the selected folder"
 msgid "Refresh the selected calendar"
 msgstr "تغییر نام شاخهٔ انتخاب شده"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
 #, fuzzy
 #| msgid "Rename the selected folder"
 msgid "Re_fresh list of account calendars"
 msgstr "تغییر نام شاخهٔ انتخاب شده"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1385
 #, fuzzy
 #| msgid "Rename the selected folder"
 msgid "Rename the selected calendar"
 msgstr "تغییر نام شاخهٔ انتخاب شده"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "Find _Next"
 msgstr "یافتن _بعدی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Find next occurrence of the current search string"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Find _Previous"
 msgstr "یافتن _پیشین"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Find previous occurrence of the current search string"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "Stop _Running Search"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Stop currently running search"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1411
 #, fuzzy
 #| msgid "Local Calendars"
 msgid "Sho_w All Calendars"
 msgstr "تقویم‌های محلی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
 #, fuzzy
 #| msgid "Show _only this Calendar"
 msgid "Show _Only This Calendar"
 msgstr "نمایش _فقط این تقویم"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "Cop_y to Calendar…"
 msgstr "_رونوشت به تقویم…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1432
 #, fuzzy
 #| msgid "_Delegate Meeting..."
 msgid "_Delegate Meeting…"
 msgstr "_واگذاری جلسه..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
 #, fuzzy
 #| msgid "Delete the appointment"
 msgid "_Delete Appointment"
 msgstr "حذف قرار"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1441
 #, fuzzy
 #| msgid "Delete the appointment"
 msgid "Delete selected appointments"
 msgstr "حذف قرار"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
 #, fuzzy
 #| msgid "Delete this _Occurrence"
 msgid "Delete This _Occurrence"
 msgstr "حذف این _دفعه"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete this occurrence"
 msgstr "حذف این مورد"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1453
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "Delete This and F_uture Occurrences"
+msgstr "حذف این _دفعه"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1455
+#, fuzzy
+#| msgid "Delete this occurrence"
+msgid "Delete this and any future occurrences"
+msgstr "حذف این مورد"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
 #, fuzzy
 #| msgid "Delete _All Occurrences"
 msgid "Delete All Occ_urrences"
 msgstr "حذف _همهٔ دفعات"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1462
 msgid "Delete all occurrences"
 msgstr "حذف همهٔ دفعات"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "Edit as Ne_w…"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1469
 #, fuzzy
 #| msgid "View the current appointment"
 msgid "Edit the current appointment as new"
 msgstr "نمایش قرار فعلی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "New All Day _Event…"
 msgstr "_رویداد تمام‌روز جدید…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1476
 #, fuzzy
 #| msgid "Create a new all-day appointment"
 msgid "Create a new all day event"
 msgstr "ایجاد یک قرار تمام روز جدید"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1481
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:584
@@ -22900,148 +23449,237 @@ msgstr "ایجاد یک قرار تمام روز جدید"
 msgid "_Forward as iCalendar…"
 msgstr "_هدایت به شکل iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1490
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Create a new meeting"
 msgstr "ایجاد یک درخواست جلسهٔ جدید"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1495
+#, fuzzy
+#| msgid "_RSVP"
+msgid "Send _RSVP"
+msgstr "_لطفاً پاسخ دهید"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1497
+#, fuzzy
+#| msgid "Signing message"
+msgid "Send a meeting response"
+msgstr "در حال امضا کردن پیام"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1502
+#, fuzzy
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "پذیرش"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1504
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Accept meeting request"
+msgstr "ایجاد یک درخواست جلسهٔ جدید"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1509
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "A_ccept this instance"
+msgstr "حذف این _دفعه"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+msgid "Accept meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../src/modules/itip-formatter/itip-view.c:1256
+msgid "_Decline"
+msgstr "_رد"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1518
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Decline meeting request"
+msgstr "ایجاد یک درخواست جلسهٔ جدید"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1523
+#, fuzzy
+#| msgid "Delete this _Occurrence"
+msgid "D_ecline this instance"
+msgstr "حذف این _دفعه"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1525
+msgid "Decline meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1530
+#, fuzzy
+#| msgid "Tentatively accept"
+msgid "_Tentatively accept"
+msgstr "پذیرش احتمالی"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1532
+#, fuzzy
+#| msgid "Create a new meeting request"
+msgid "Tentatively accept meeting request"
+msgstr "ایجاد یک درخواست جلسهٔ جدید"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1537
+#, fuzzy
+#| msgid "Tentatively accept"
+msgid "Te_ntatively accept this instance"
+msgstr "پذیرش احتمالی"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1539
+msgid "Tentatively accept meeting request for selected instance only"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Mo_ve to Calendar…"
-msgstr "_جابه‌جایی به تقویم"
+msgstr "_جابه‌جایی به تقویم…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Make this Occurrence _Movable"
 msgstr "قابل جابه‌جایی کردن این دفعه"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1565
 msgid "_Open Appointment"
 msgstr "_باز کردن قرار"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "View the current appointment"
 msgstr "نمایش قرار فعلی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
 msgid "_Schedule Meeting…"
 msgstr "_زمان‌بندی جلسه…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
 #, fuzzy
 #| msgid "Purge old appointments and meetings"
 msgid "Converts an appointment to a meeting"
 msgstr "پاک‌سازی جلسات و قرارهای قدیمی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
 msgid "Conv_ert to Appointment…"
 msgstr "_تبدیل به قرار ملاقات…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
 #, fuzzy
 #| msgid "%s at the end of the appointment"
 msgid "Converts a meeting to an appointment"
 msgstr "%s در پایان قرار"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
 msgid "Quit"
 msgstr "_خروج"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show T_asks and Memos pane"
+msgstr "نشان دادن قاب پیش‌نمایش"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1732
+#, fuzzy
+#| msgid "Show preview pane"
+msgid "Show Tasks and Memos pane"
+msgstr "نشان دادن قاب پیش‌نمایش"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
 msgid "Day"
 msgstr "روز"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1753
 msgid "Show one day"
 msgstr "نمایش یک روز"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1758
 msgid "List"
 msgstr "فهرست"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Show as list"
 msgstr "نمایش به صورت فهرست"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1765
 msgid "Month"
 msgstr "ماه"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Show one month"
 msgstr "نمایش یک ماه"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1772
 msgid "Week"
 msgstr "هفته"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1774
 msgid "Show one week"
 msgstr "نمایش یک هفته"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1781
 #, fuzzy
 #| msgid "Show one week"
 msgid "Show one work week"
 msgstr "نمایش یک هفته"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1789
 #, fuzzy
 #| msgid "Save Appointment"
 msgid "Active Appointments"
 msgstr "ذخیرهٔ قرار"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1803
 #, fuzzy
 #| msgid "All Day A_ppointment"
 msgid "Next 7 Days’ Appointments"
 msgstr "قرار تمام روز"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1810
 msgid "Occurs Less Than 5 Times"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1841
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:814
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1043
 msgid "Description contains"
 msgstr "شرح‌های حاوی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1848
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:821
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1050
 msgid "Summary contains"
 msgstr "خلاصه‌های حاوی"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1858
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1872
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:831
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:845
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1060
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1074
 msgid "Print…"
 msgstr "چاپ…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1860
 msgid "Print this calendar"
 msgstr "چاپ این تقویم"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1867
 #, fuzzy
 #| msgid "Previews the calendar to be printed"
 msgid "Preview the calendar to be printed"
 msgstr "پیش‌نمایش تقویمی که قرار است چاپ شود"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1889
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:862
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1091
 msgid "_Save as iCalendar…"
 msgstr "_ذخیره به شکل iCalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1969
 msgid "Go To"
 msgstr "رفتن به"
 
@@ -23092,29 +23730,29 @@ msgstr "باز کردن صفحهٔ وب"
 msgid "Print the selected memo"
 msgstr "نمایش یادداشت‌های انتخاب شده"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
 msgid "Searching next matching event"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
 msgid "Searching previous matching event"
 msgstr ""
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
 msgid "Cannot search with no active calendar"
 msgstr ""
 
@@ -23180,7 +23818,7 @@ msgid "View the selected task"
 msgstr "نمایش تکلیف‌های انتخاب شده"
 
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1076
 #, fuzzy
 #| msgid "View the selected task"
 msgid "Print the selected task"
@@ -23338,14 +23976,6 @@ msgid_plural "%d memos"
 msgstr[0] "‫%d یادداشت"
 msgstr[1] "‫%d یادداشت"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:365
-#: ../src/modules/calendar/e-task-shell-view-private.c:577
-#, fuzzy, c-format
-#| msgid ", %d selected"
-#| msgid_plural ", %d selected"
-msgid "%d selected"
-msgstr "، %Idتا انتخاب شده"
-
 #: ../src/modules/calendar/e-task-shell-backend.c:75
 msgctxt "New"
 msgid "_Task"
@@ -23502,57 +24132,87 @@ msgid "Completed Tasks"
 msgstr "تکلیف‌های کامل‌شده"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:977
+#, fuzzy
+#| msgid "Completed Tasks"
+msgid "Uncompleted Tasks"
+msgstr "تکلیف‌های کامل‌شده"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#, fuzzy
+#| msgid "Cancel Task"
+msgid "Scheduled Tasks"
+msgstr "لغو تکلیف"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:986
+#, fuzzy
+#| msgid "_Show Tasks without Due date"
+msgid "Show scheduled tasks, aka those with a Due date"
+msgstr "_نمایش تکلیف‌ها بدون تاریخ سررسید"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Next 7 Days’ Tasks"
 msgstr "تکلیف‌های ۷ روز آینده"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:984
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 #, fuzzy
 #| msgid "_Overdue tasks:"
 msgid "Overdue Tasks"
 msgstr "تکلیف‌های _عقب افتاده"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:991
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
 #, fuzzy
 #| msgid "Show Attachments"
 msgid "Tasks with Attachments"
 msgstr "نشان دادن پیوست‌ها"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1019
+#, fuzzy
+#| msgid "Print Tasks"
+msgid "Started Tasks"
+msgstr "چاپ تکلیف‌ها"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
+msgid ""
+"Filters for tasks that either do not have a start date or the start date is "
+"earlier than the time the filter is selected at"
+msgstr ""
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
 msgid "Print the list of tasks"
 msgstr "چاپ فهرست تکلیف‌ها"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1069
 #, fuzzy
 #| msgid "Previews the list of tasks to be printed"
 msgid "Preview the list of tasks to be printed"
 msgstr "فهرست تکلیف‌هایی که باید چاپ شوند را پیش‌نمایش می‌دهد"
 
-#: ../src/modules/calendar/e-task-shell-view.c:346
+#: ../src/modules/calendar/e-task-shell-view.c:368
 #, fuzzy
 #| msgid "Select Task List"
 msgid "Delete Tasks"
 msgstr "انتخاب فهرست تکلیف"
 
-#: ../src/modules/calendar/e-task-shell-view.c:348
+#: ../src/modules/calendar/e-task-shell-view.c:370
 #, fuzzy
 #| msgid "_Delete all"
 msgid "Delete Task"
 msgstr "_حذف همه"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:573
+#: ../src/modules/calendar/e-task-shell-view-private.c:570
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "‫%d تکلیف"
 msgstr[1] "‫%d تکلیف"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:380
 #, fuzzy
 #| msgid "Con_vert to Meeting"
 msgid "Convert to M_eeting"
 msgstr "_تبدیل به جلسه"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:382
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Convert the message to a meeting request"
@@ -23576,53 +24236,54 @@ msgstr "نگارش یک پیام نامه‌ای جدید"
 msgid "Look up configuration with e-mail domain"
 msgstr "نسخهٔ آخرین پیکربندی ارتقاء یافته"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "Looking up IMAP server…"
 msgstr "در حال گشتن برای کارساز IMAP…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "Looking up POP3 server…"
 msgstr "در حال گشتن برای کارساز POP3…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "Looking up SMTP server…"
 msgstr "در حال گشتن برای کارساز SMTP…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CalDAV server"
 msgstr "کارساز CalDAV"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
 msgid "Looking up CalDAV server…"
 msgstr "در حال گشتن برای کارساز CalDAV…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
 msgid "CardDAV server"
 msgstr "کارساز CardDAV"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
 msgid "Looking up CardDAV server…"
 msgstr "در حال گشتن برای کارساز CardDAV…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "LDAP server"
 msgstr "کارساز LDAP"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
 msgid "Looking up LDAP server…"
 msgstr "در حال گشتن به دنبال کارساز LDAP…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:285
 msgid "Look up in SRV records"
 msgstr "گشتن در رکوردهای SRV"
 
@@ -23640,215 +24301,231 @@ msgstr "CardDAV: %s"
 msgid "CalDAV and CardDAV server"
 msgstr "کارساز CalDAV و CardDAV"
 
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:162
+#, fuzzy
+#| msgid "Enter password for %s (user %s)"
+msgid "Requires password to continue."
+msgstr "گذرواژهٔ %s (کاربر %s) را وارد کنید"
+
 #: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "گشتن برای کارساز CalDAV و CardDAV"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:164
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "Display part as an invitation"
 msgstr ""
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:261
+#: ../src/modules/itip-formatter/itip-view.c:266
 msgid "Today %H:%M"
 msgstr "امروز %OH:%OM"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:265
+#: ../src/modules/itip-formatter/itip-view.c:270
 msgid "Today %H:%M:%S"
 msgstr "امروز %OH:%OM:%OS"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:274
+#: ../src/modules/itip-formatter/itip-view.c:279
 msgid "Today %l:%M:%S %p"
 msgstr "امروز %OH:%OM:%OS"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:289
+#: ../src/modules/itip-formatter/itip-view.c:294
 msgid "Tomorrow %H:%M"
 msgstr "فردا %OH:%OM"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:293
+#: ../src/modules/itip-formatter/itip-view.c:298
 msgid "Tomorrow %H:%M:%S"
 msgstr "فردا %OH:%OM:%OS"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:298
+#: ../src/modules/itip-formatter/itip-view.c:303
 msgid "Tomorrow %l:%M %p"
 msgstr "فردا %OH:%OM"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:302
+#: ../src/modules/itip-formatter/itip-view.c:307
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "فردا %OH:%OM:%OS"
 
 #. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:321
+#: ../src/modules/itip-formatter/itip-view.c:326
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:326
+#: ../src/modules/itip-formatter/itip-view.c:331
 msgid "%A %H:%M"
 msgstr "%A %OH:%OM"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:330
+#: ../src/modules/itip-formatter/itip-view.c:335
 msgid "%A %H:%M:%S"
 msgstr "%A %OH:%OM:%OS"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:335
+#: ../src/modules/itip-formatter/itip-view.c:340
 msgid "%A %l:%M %p"
 msgstr "%A %OH:%OM"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:339
+#: ../src/modules/itip-formatter/itip-view.c:344
 msgid "%A %l:%M:%S %p"
 msgstr "%A %OH:%OM:%OS"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:348
+#: ../src/modules/itip-formatter/itip-view.c:355
 msgid "%A, %B %e"
 msgstr "%A، %Oe %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:354
+#: ../src/modules/itip-formatter/itip-view.c:361
 msgid "%A, %B %e %H:%M"
 msgstr "%A، %Oe %B، %OH:%OM"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:358
+#: ../src/modules/itip-formatter/itip-view.c:365
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A، %Oe %B، %OH:%OM:%OS"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:363
+#: ../src/modules/itip-formatter/itip-view.c:370
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A، %Oe %B، %OH:%OM"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:367
+#: ../src/modules/itip-formatter/itip-view.c:374
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A، %Oe %B، %OH:%OM:%OS"
 
 #. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:373
+#: ../src/modules/itip-formatter/itip-view.c:382
 msgid "%A, %B %e, %Y"
 msgstr "%A، %Oe %B %Oy"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:378
+#: ../src/modules/itip-formatter/itip-view.c:387
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A، %Oe %B %Oy، %OH:%OM"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:382
+#: ../src/modules/itip-formatter/itip-view.c:391
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A، %Oe %B %Oy، %OH:%OM:%OS"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:387
+#: ../src/modules/itip-formatter/itip-view.c:396
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A، %Oe %B %Oy، %OH:%OM"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:391
+#: ../src/modules/itip-formatter/itip-view.c:400
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A، %Oe %B %Oy، %OH:%OM:%OS"
 
-#: ../src/modules/itip-formatter/itip-view.c:429
-#: ../src/modules/itip-formatter/itip-view.c:430
-#: ../src/modules/itip-formatter/itip-view.c:519
-#: ../src/modules/itip-formatter/itip-view.c:520
-#: ../src/modules/itip-formatter/itip-view.c:609
+#. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end, 
like "Tomorrow" or "Tomorrow 10:30";
+#. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks 
like depends on the user settings.
+#. Example: 'Tomorrow 10:30 (20.2.2020)'
+#: ../src/modules/itip-formatter/itip-view.c:427
+#, fuzzy, c-format
+#| msgid "%s (%d items)"
+msgctxt "cal-itip"
+msgid "%s (%s)"
+msgstr "%s (%Id مورد)"
+
+#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:466
+#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:556
+#: ../src/modules/itip-formatter/itip-view.c:645
 msgid "An unknown person"
 msgstr "یک شخص نامعلوم"
 
-#: ../src/modules/itip-formatter/itip-view.c:434
-#: ../src/modules/itip-formatter/itip-view.c:524
-#: ../src/modules/itip-formatter/itip-view.c:613
+#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:649
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:436
-#: ../src/modules/itip-formatter/itip-view.c:526
-#: ../src/modules/itip-formatter/itip-view.c:615
+#: ../src/modules/itip-formatter/itip-view.c:472
+#: ../src/modules/itip-formatter/itip-view.c:562
+#: ../src/modules/itip-formatter/itip-view.c:651
 #, c-format
 msgid "Received on behalf of %s"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:441
+#: ../src/modules/itip-formatter/itip-view.c:477
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has published the following meeting information:"
 msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> از طریق %s اطلاعات جلسهٔ زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:443
+#: ../src/modules/itip-formatter/itip-view.c:479
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following meeting information:"
 msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> اطلاعات جلسهٔ زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:484
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has delegated the following meeting to you:"
 msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> جلسهٔ زیر را به شما واگذار کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:451
+#: ../src/modules/itip-formatter/itip-view.c:487
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b>از طریق %s خواستار حضور شما در جلسهٔ زیر است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:453
+#: ../src/modules/itip-formatter/itip-view.c:489
 #, fuzzy, c-format
 #| msgid "<b>%s</b> requests your presence at the following meeting:"
 msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> خواستار حضور شما در جلسهٔ زیر است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:459
+#: ../src/modules/itip-formatter/itip-view.c:495
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> از طریق %s می‌خواهد به جلسهٔ موجود افزوده شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:461
+#: ../src/modules/itip-formatter/itip-view.c:497
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> می‌خواهد به جلسهٔ موجود افزوده شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:465
+#: ../src/modules/itip-formatter/itip-view.c:501
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following meeting:"
@@ -23856,104 +24533,104 @@ msgid ""
 "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> مایل است آخرین اطلاعات جلسهٔ زیر را دریافت کند:"
 
-#: ../src/modules/itip-formatter/itip-view.c:467
+#: ../src/modules/itip-formatter/itip-view.c:503
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> مایل است آخرین اطلاعات جلسهٔ زیر را دریافت کند:"
 
-#: ../src/modules/itip-formatter/itip-view.c:471
+#: ../src/modules/itip-formatter/itip-view.c:507
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following meeting response:"
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> پاسخ جلسهٔ زیر را  فرستاده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:473
+#: ../src/modules/itip-formatter/itip-view.c:509
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following meeting response:"
 msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> پاسخ جلسهٔ زیر را  فرستاده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:477
+#: ../src/modules/itip-formatter/itip-view.c:513
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following meeting:"
 msgstr "<b>%s</b> از طریق %s جلسهٔ زیر را لغو کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:479
+#: ../src/modules/itip-formatter/itip-view.c:515
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following meeting."
 msgid "%s has cancelled the following meeting:"
 msgstr "<b>%s</b> جلسهٔ زیر را لغو کرده است."
 
-#: ../src/modules/itip-formatter/itip-view.c:483
+#: ../src/modules/itip-formatter/itip-view.c:519
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following meeting changes."
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> تغییرات جلسهٔ زیر را پیشنهاد کرده است."
 
-#: ../src/modules/itip-formatter/itip-view.c:485
+#: ../src/modules/itip-formatter/itip-view.c:521
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following meeting changes."
 msgid "%s has proposed the following meeting changes:"
 msgstr "<b>%s</b> تغییرات جلسهٔ زیر را پیشنهاد کرده است."
 
-#: ../src/modules/itip-formatter/itip-view.c:489
+#: ../src/modules/itip-formatter/itip-view.c:525
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> از طریق %s تغییرات جلسهٔ زیر را پیشنهاد کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:491
+#: ../src/modules/itip-formatter/itip-view.c:527
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has declined the following meeting changes."
 msgid "%s has declined the following meeting changes:"
 msgstr "<b>%s</b> تغییرات جلسهٔ زیر را رد کرده است."
 
-#: ../src/modules/itip-formatter/itip-view.c:531
+#: ../src/modules/itip-formatter/itip-view.c:567
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has published the following task:"
 msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b>از طریق %s تکلیف زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:533
+#: ../src/modules/itip-formatter/itip-view.c:569
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following task:"
 msgstr "<b>%s</b> تکلیف زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:574
 #, fuzzy, c-format
 #| msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> خواستار تخصیص %s به تکلیف زیر شده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:541
+#: ../src/modules/itip-formatter/itip-view.c:577
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has assigned you a task:"
 msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> از طریق %s تکلیفی به شما تخصیص داده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:543
+#: ../src/modules/itip-formatter/itip-view.c:579
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has assigned you a task:"
 msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> تکلیفی به شما تخصیص داده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:549
+#: ../src/modules/itip-formatter/itip-view.c:585
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> از طریق %s میل دارد به یک تکلیف موجود اضافه شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:551
+#: ../src/modules/itip-formatter/itip-view.c:587
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing task:"
 msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b> میل دارد به یک تکلیف موجود اضافه شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:555
+#: ../src/modules/itip-formatter/itip-view.c:591
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following assigned "
@@ -23963,7 +24640,7 @@ msgid ""
 "task:"
 msgstr "<b>%s</b> مایل است آخرین اطلاعات تکلیف تخصیص داده شدهٔ زیر را دریافت کند"
 
-#: ../src/modules/itip-formatter/itip-view.c:557
+#: ../src/modules/itip-formatter/itip-view.c:593
 #, fuzzy, c-format
 #| msgid ""
 #| "<b>%s</b> wishes to receive the latest information for the following assigned "
@@ -23971,227 +24648,223 @@ msgstr "<b>%s</b> مایل است آخرین اطلاعات تکلیف تخصی
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "<b>%s</b> مایل است آخرین اطلاعات تکلیف تخصیص داده شدهٔ زیر را دریافت کند"
 
-#: ../src/modules/itip-formatter/itip-view.c:561
+#: ../src/modules/itip-formatter/itip-view.c:597
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following assigned task response:"
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> پیام تکلیف تخصیص داده شدهٔ زیر را فرستاده کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:563
+#: ../src/modules/itip-formatter/itip-view.c:599
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has sent back the following assigned task response:"
 msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> پیام تکلیف تخصیص داده شدهٔ زیر را فرستاده کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:567
+#: ../src/modules/itip-formatter/itip-view.c:603
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgid "%s through %s has cancelled the following assigned task:"
 msgstr "<b>%s</b> از طریق %s تکلیف تخصیص داده شدهٔ زیر را لغو کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:569
+#: ../src/modules/itip-formatter/itip-view.c:605
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following assigned task:"
 msgid "%s has cancelled the following assigned task:"
 msgstr "<b>%s</b> تکلیف تخصیص داده شدهٔ زیر را لغو کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:573
+#: ../src/modules/itip-formatter/itip-view.c:609
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> تغییرات تخصیص تکلیف زیر را پیشنهاد کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:575
+#: ../src/modules/itip-formatter/itip-view.c:611
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> تغییرات تخصیص تکلیف زیر را پیشنهاد کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:579
+#: ../src/modules/itip-formatter/itip-view.c:615
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> از طریق %s تکلیف تخصیص داده‌ شدهٔ زیر را رد کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:581
+#: ../src/modules/itip-formatter/itip-view.c:617
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has declined the following assigned task:"
 msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> تکلیف تخصیص داده‌ شدهٔ زیر را رد کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:620
+#: ../src/modules/itip-formatter/itip-view.c:656
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has published the following task:"
 msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b>از طریق %s تکلیف زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:622
+#: ../src/modules/itip-formatter/itip-view.c:658
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has published the following task:"
 msgid "%s has published the following memo:"
 msgstr "<b>%s</b> تکلیف زیر را منتشر کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:627
+#: ../src/modules/itip-formatter/itip-view.c:663
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> از طریق %s می‌خواهد به جلسهٔ موجود افزوده شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:629
+#: ../src/modules/itip-formatter/itip-view.c:665
 #, fuzzy, c-format
 #| msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> می‌خواهد به جلسهٔ موجود افزوده شود:"
 
-#: ../src/modules/itip-formatter/itip-view.c:633
+#: ../src/modules/itip-formatter/itip-view.c:669
 #, fuzzy, c-format
 #| msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgid "%s through %s has cancelled the following shared memo:"
 msgstr "<b>%s</b> از طریق %s جلسهٔ زیر را لغو کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:635
+#: ../src/modules/itip-formatter/itip-view.c:671
 #, fuzzy, c-format
 #| msgid "<b>%s</b> has canceled the following assigned task:"
 msgid "%s has cancelled the following shared memo:"
 msgstr "<b>%s</b> تکلیف تخصیص داده شدهٔ زیر را لغو کرده است:"
 
-#: ../src/modules/itip-formatter/itip-view.c:798
+#: ../src/modules/itip-formatter/itip-view.c:859
 msgid "All day:"
 msgstr "تمام روز:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
+#: ../src/modules/itip-formatter/itip-view.c:865
 msgid "Start day:"
 msgstr "روز آغاز:"
 
-#: ../src/modules/itip-formatter/itip-view.c:804
-#: ../src/modules/itip-formatter/itip-view.c:1636
+#: ../src/modules/itip-formatter/itip-view.c:865
+#: ../src/modules/itip-formatter/itip-view.c:1707
 msgid "Start time:"
 msgstr "زمان آغاز:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
+#: ../src/modules/itip-formatter/itip-view.c:874
 msgid "End day:"
 msgstr "%روز پایان:"
 
-#: ../src/modules/itip-formatter/itip-view.c:813
-#: ../src/modules/itip-formatter/itip-view.c:1637
+#: ../src/modules/itip-formatter/itip-view.c:874
+#: ../src/modules/itip-formatter/itip-view.c:1708
 msgid "End time:"
 msgstr "زمان پایان:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1183
+#: ../src/modules/itip-formatter/itip-view.c:1250
 msgid "Ope_n Calendar"
 msgstr "_گشودن تقویم"
 
-#: ../src/modules/itip-formatter/itip-view.c:1186
+#: ../src/modules/itip-formatter/itip-view.c:1253
 msgid "_Decline all"
 msgstr "_رد همه"
 
-#: ../src/modules/itip-formatter/itip-view.c:1189
-msgid "_Decline"
-msgstr "_رد"
-
-#: ../src/modules/itip-formatter/itip-view.c:1192
+#: ../src/modules/itip-formatter/itip-view.c:1259
 msgid "_Tentative all"
 msgstr "همه _احتمالی"
 
-#: ../src/modules/itip-formatter/itip-view.c:1195
+#: ../src/modules/itip-formatter/itip-view.c:1262
 msgid "_Tentative"
 msgstr "_احتمالی"
 
-#: ../src/modules/itip-formatter/itip-view.c:1198
+#: ../src/modules/itip-formatter/itip-view.c:1265
 msgid "Acce_pt all"
 msgstr "پذیرش همه"
 
-#: ../src/modules/itip-formatter/itip-view.c:1201
+#: ../src/modules/itip-formatter/itip-view.c:1268
 msgid "Acce_pt"
 msgstr "پذیرش"
 
-#: ../src/modules/itip-formatter/itip-view.c:1204
+#: ../src/modules/itip-formatter/itip-view.c:1271
 msgid "Send _Information"
 msgstr "فرستادن _اطّلاعات"
 
-#: ../src/modules/itip-formatter/itip-view.c:1207
+#: ../src/modules/itip-formatter/itip-view.c:1274
 msgid "_Update Attendee Status"
 msgstr "_به‌هنگام‌سازی وضعیت شرکت‌کنندگان"
 
-#: ../src/modules/itip-formatter/itip-view.c:1210
-#: ../src/smime/gui/certificate-manager.c:1661
+#: ../src/modules/itip-formatter/itip-view.c:1277
+#: ../src/smime/gui/certificate-manager.c:1659
 msgid "_Update"
 msgstr "_به‌هنگام سازی"
 
-#: ../src/modules/itip-formatter/itip-view.c:1639
-#: ../src/modules/itip-formatter/itip-view.c:1687
-#: ../src/modules/itip-formatter/itip-view.c:1758
+#: ../src/modules/itip-formatter/itip-view.c:1710
+#: ../src/modules/itip-formatter/itip-view.c:1759
+#: ../src/modules/itip-formatter/itip-view.c:1833
 msgid "Comment:"
 msgstr "توضیح:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1675
+#: ../src/modules/itip-formatter/itip-view.c:1747
 msgid "Send reply to sender"
 msgstr "فرستادن پاسخ به فرستنده"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1690
+#: ../src/modules/itip-formatter/itip-view.c:1762
 #, fuzzy
 #| msgid "Send u_pdates to attendees"
 msgid "Send _updates to attendees"
 msgstr "فرستادن به‌هنگام‌سازی‌ها به شرکت‌کنندگان"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1693
+#: ../src/modules/itip-formatter/itip-view.c:1765
 #, fuzzy
 #| msgid "A_pply to all instances"
 msgid "_Apply to all instances"
 msgstr "اِ_عمال به همهٔ نمونه‌ها"
 
-#: ../src/modules/itip-formatter/itip-view.c:1694
+#: ../src/modules/itip-formatter/itip-view.c:1766
 msgid "Show time as _free"
 msgstr "نمایش زمان به شکل _آزاد"
 
-#: ../src/modules/itip-formatter/itip-view.c:1695
+#: ../src/modules/itip-formatter/itip-view.c:1767
 msgid "_Preserve my reminder"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:1696
+#: ../src/modules/itip-formatter/itip-view.c:1768
 #, fuzzy
 #| msgid "Sh_ow a reminder"
 msgid "_Inherit reminder"
 msgstr "نمای_ش یک یادآور"
 
-#: ../src/modules/itip-formatter/itip-view.c:1910
+#: ../src/modules/itip-formatter/itip-view.c:1988
 msgid "_Tasks:"
 msgstr "_تکلیف‌ها:"
 
-#: ../src/modules/itip-formatter/itip-view.c:1913
+#: ../src/modules/itip-formatter/itip-view.c:1991
 msgid "_Memos:"
 msgstr "_یادداشت‌ها:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2909
+#: ../src/modules/itip-formatter/itip-view.c:3058
 msgid "Sa_ve"
 msgstr "_ذخیره"
 
-#: ../src/modules/itip-formatter/itip-view.c:3470
-#: ../src/modules/itip-formatter/itip-view.c:5222
+#: ../src/modules/itip-formatter/itip-view.c:3585
+#: ../src/modules/itip-formatter/itip-view.c:5286
 msgid "Attendee status updated"
 msgstr "وضعیت شرکت‌کنندگان به‌هنگام‌سازی شد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3680
+#: ../src/modules/itip-formatter/itip-view.c:3816
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "قراری در تقویم «%s» با این جلسه تداخل دارد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3687
+#: ../src/modules/itip-formatter/itip-view.c:3823
 #, c-format
 msgid "A task “%s” in the task list “%s” conflicts with this task"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:3694
+#: ../src/modules/itip-formatter/itip-view.c:3830
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
 msgstr "قراری در تقویم «%s» با این جلسه تداخل دارد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3705
+#: ../src/modules/itip-formatter/itip-view.c:3841
 #, fuzzy, c-format
 #| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "The calendar “%s” contains an appointment which conflicts with this meeting"
@@ -24200,308 +24873,312 @@ msgid_plural ""
 msgstr[0] "قراری در تقویم «%s» با این جلسه تداخل دارد"
 msgstr[1] "قراری در تقویم «%s» با این جلسه تداخل دارد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3714
+#: ../src/modules/itip-formatter/itip-view.c:3850
 #, c-format
 msgid "The task list “%s” contains a task which conflicts with this task"
 msgid_plural "The task list “%s” contains %d tasks which conflict with this task"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/modules/itip-formatter/itip-view.c:3723
+#: ../src/modules/itip-formatter/itip-view.c:3859
 #, c-format
 msgid "The memo list “%s” contains a memo which conflicts with this memo"
 msgid_plural "The memo list “%s” contains %d memos which conflict with this memo"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/modules/itip-formatter/itip-view.c:3761
+#: ../src/modules/itip-formatter/itip-view.c:3897
 #, fuzzy, c-format
 #| msgid "Found the appointment in the calendar '%s'"
 msgid "Found the appointment in the calendar “%s”"
 msgstr "قرار در تقویم «%s» پیدا شد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3766
+#: ../src/modules/itip-formatter/itip-view.c:3902
 #, fuzzy, c-format
 #| msgid "Unable to find this task in any task list"
 msgid "Found the task in the task list “%s”"
 msgstr "این تکلیف در هیچ فهرست تکلیفی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3771
+#: ../src/modules/itip-formatter/itip-view.c:3907
 #, fuzzy, c-format
 #| msgid "Unable to find this task in any task list"
 msgid "Found the memo in the memo list “%s”"
 msgstr "این تکلیف در هیچ فهرست تکلیفی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3782
+#: ../src/modules/itip-formatter/itip-view.c:3918
 #, fuzzy
 #| msgid "Object is invalid and cannot be updated\n"
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "شیء نامعتبر است و به‌هنگام‌سازی آن ممکن نیست\n"
 
-#: ../src/modules/itip-formatter/itip-view.c:3924
+#: ../src/modules/itip-formatter/itip-view.c:4063
 msgid "Unable to find any calendars"
 msgstr "هیچ تقویمی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3932
+#: ../src/modules/itip-formatter/itip-view.c:4071
 msgid "Unable to find this meeting in any calendar"
 msgstr "این جلسه در هیچ تقویمی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3937
+#: ../src/modules/itip-formatter/itip-view.c:4076
 msgid "Unable to find this task in any task list"
 msgstr "این تکلیف در هیچ فهرست تکلیفی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:3942
+#: ../src/modules/itip-formatter/itip-view.c:4081
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Unable to find this memo in any memo list"
 msgstr "این تکلیف در هیچ فهرست تکلیفی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:4236
+#: ../src/modules/itip-formatter/itip-view.c:4394
 msgid "Searching for an existing version of this appointment"
 msgstr "در حال جست‌وجو برای نگارشی موجود از این قرار"
 
-#: ../src/modules/itip-formatter/itip-view.c:4240
+#: ../src/modules/itip-formatter/itip-view.c:4398
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this task"
 msgstr "در حال جست‌وجو به دنبال نسخهٔ موجود این قرار!"
 
-#: ../src/modules/itip-formatter/itip-view.c:4244
+#: ../src/modules/itip-formatter/itip-view.c:4402
 #, fuzzy
 #| msgid "Searching for an existing version of this appointment"
 msgid "Searching for an existing version of this memo"
 msgstr "در حال جست‌وجو به دنبال نسخهٔ موجود این قرار!"
 
-#: ../src/modules/itip-formatter/itip-view.c:4302
+#: ../src/modules/itip-formatter/itip-view.c:4460
 #, fuzzy
 #| msgid "Opening calendar"
 msgid "Opening the calendar. Please wait…"
 msgstr "در حال باز کردن تقویم"
 
-#: ../src/modules/itip-formatter/itip-view.c:4718
+#: ../src/modules/itip-formatter/itip-view.c:4810
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to calendar “%s”. %s"
 msgstr "ارسال مورد به تقویم «%s» ممکن نیست. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4726
+#: ../src/modules/itip-formatter/itip-view.c:4818
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to task list “%s”. %s"
 msgstr "ارسال مورد به تقویم «%s» ممکن نیست. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4734
+#: ../src/modules/itip-formatter/itip-view.c:4826
 #, fuzzy, c-format
 #| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to memo list “%s”. %s"
 msgstr "ارسال مورد به تقویم «%s» ممکن نیست. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4754
+#: ../src/modules/itip-formatter/itip-view.c:4847
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "ارسال به تقویم «%s» به عنوان پذیرفته شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4759
+#: ../src/modules/itip-formatter/itip-view.c:4852
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to task list “%s” as accepted"
 msgstr "ارسال به تقویم «%s» به عنوان پذیرفته شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4764
+#: ../src/modules/itip-formatter/itip-view.c:4857
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to memo list “%s” as accepted"
 msgstr "ارسال به تقویم «%s» به عنوان پذیرفته شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4774
+#: ../src/modules/itip-formatter/itip-view.c:4867
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "ارسال به تقویم «%s» به عنوان احتمالی"
 
-#: ../src/modules/itip-formatter/itip-view.c:4779
+#: ../src/modules/itip-formatter/itip-view.c:4872
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to task list “%s” as tentative"
 msgstr "ارسال به تقویم «%s» به عنوان احتمالی"
 
-#: ../src/modules/itip-formatter/itip-view.c:4784
+#: ../src/modules/itip-formatter/itip-view.c:4877
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to memo list “%s” as tentative"
 msgstr "ارسال به تقویم «%s» به عنوان احتمالی"
 
-#: ../src/modules/itip-formatter/itip-view.c:4794
+#: ../src/modules/itip-formatter/itip-view.c:4887
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "ارسال به تقویم «%s» به عنوان رد شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4799
+#: ../src/modules/itip-formatter/itip-view.c:4892
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to task list “%s” as declined"
 msgstr "ارسال به تقویم «%s» به عنوان رد شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4804
+#: ../src/modules/itip-formatter/itip-view.c:4897
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to memo list “%s” as declined"
 msgstr "ارسال به تقویم «%s» به عنوان رد شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4814
+#: ../src/modules/itip-formatter/itip-view.c:4907
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "ارسال به تقویم «%s» به عنوان لغو شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4819
+#: ../src/modules/itip-formatter/itip-view.c:4912
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to task list “%s” as cancelled"
 msgstr "ارسال به تقویم «%s» به عنوان لغو شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4824
+#: ../src/modules/itip-formatter/itip-view.c:4917
 #, fuzzy, c-format
 #| msgid "Sent to calendar '%s' as canceled"
 msgid "Sent to memo list “%s” as cancelled"
 msgstr "ارسال به تقویم «%s» به عنوان لغو شده"
 
-#: ../src/modules/itip-formatter/itip-view.c:4842
+#: ../src/modules/itip-formatter/itip-view.c:4936
 #, fuzzy
 #| msgid "Opening calendar"
 msgid "Saving changes to the calendar. Please wait…"
 msgstr "در حال باز کردن تقویم"
 
-#: ../src/modules/itip-formatter/itip-view.c:4845
+#: ../src/modules/itip-formatter/itip-view.c:4939
 msgid "Saving changes to the task list. Please wait…"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:4848
+#: ../src/modules/itip-formatter/itip-view.c:4942
 msgid "Saving changes to the memo list. Please wait…"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:4939
+#: ../src/modules/itip-formatter/itip-view.c:5013
 msgid "Unable to parse item"
 msgstr "تجزیهٔ مورد ممکن نیست"
 
-#: ../src/modules/itip-formatter/itip-view.c:5147
+#: ../src/modules/itip-formatter/itip-view.c:5211
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "سازمان‌دهنده نمایندهٔ %s را حذف کرد "
 
-#: ../src/modules/itip-formatter/itip-view.c:5164
-msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5228
+#, fuzzy
+#| msgid "Sent a cancelation notice to the delegate"
+msgid "Sent a cancellation notice to the delegate"
 msgstr "اطلاع انصراف برای نماینده ارسال شد"
 
-#: ../src/modules/itip-formatter/itip-view.c:5168
-msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5232
+#, fuzzy
+#| msgid "Could not send the cancelation notice to the delegate"
+msgid "Could not send the cancellation notice to the delegate"
 msgstr "فرستادن اطلاع انصراف به نماینده ممکن نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:5214
+#: ../src/modules/itip-formatter/itip-view.c:5278
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "به‌هنگام‌سازی شرکت‌کنندگان ممکن نیست. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5247
+#: ../src/modules/itip-formatter/itip-view.c:5311
 #, fuzzy
 #| msgid "Object is invalid and cannot be updated\n"
 msgid "The meeting is invalid and cannot be updated"
 msgstr "شیء نامعتبر است و به‌هنگام‌سازی آن ممکن نیست\n"
 
-#: ../src/modules/itip-formatter/itip-view.c:5332
+#: ../src/modules/itip-formatter/itip-view.c:5396
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "به‌هنگام‌سازی وضعیت شرکت‌کنندگان ممکن نیست چون وضعیت نامعتبر است"
 
-#: ../src/modules/itip-formatter/itip-view.c:5407
-#: ../src/modules/itip-formatter/itip-view.c:5445
+#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5510
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "به‌هنگام‌سازی وضعیت شرکت‌کننده ممکن نیست چون مورد دیگر وجود ندارد"
 
-#: ../src/modules/itip-formatter/itip-view.c:5506
+#: ../src/modules/itip-formatter/itip-view.c:5571
 #, fuzzy
 #| msgid "Meeting Information"
 msgid "Meeting information sent"
 msgstr "اطلاعات جلسه"
 
-#: ../src/modules/itip-formatter/itip-view.c:5511
+#: ../src/modules/itip-formatter/itip-view.c:5576
 #, fuzzy
 #| msgid "Task information"
 msgid "Task information sent"
 msgstr "اطلاعات تکلیف"
 
-#: ../src/modules/itip-formatter/itip-view.c:5516
+#: ../src/modules/itip-formatter/itip-view.c:5581
 #, fuzzy
 #| msgid "No Information"
 msgid "Memo information sent"
 msgstr "بدون اطلاعات"
 
-#: ../src/modules/itip-formatter/itip-view.c:5527
+#: ../src/modules/itip-formatter/itip-view.c:5592
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../src/modules/itip-formatter/itip-view.c:5532
+#: ../src/modules/itip-formatter/itip-view.c:5597
 #, fuzzy
 #| msgid "Unable to find this task in any task list"
 msgid "Unable to send task information, the task does not exist"
 msgstr "این تکلیف در هیچ فهرست تکلیفی پیدا نشد"
 
-#: ../src/modules/itip-formatter/itip-view.c:5537
+#: ../src/modules/itip-formatter/itip-view.c:5602
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5582
+#: ../src/modules/itip-formatter/itip-view.c:5647
 msgid "calendar.ics"
 msgstr "تقویم.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5587
+#: ../src/modules/itip-formatter/itip-view.c:5652
 msgid "Save Calendar"
 msgstr "ذخیرهٔ تقویم"
 
-#: ../src/modules/itip-formatter/itip-view.c:5635
-#: ../src/modules/itip-formatter/itip-view.c:5648
+#: ../src/modules/itip-formatter/itip-view.c:5700
+#: ../src/modules/itip-formatter/itip-view.c:5713
 msgid "The calendar attached is not valid"
 msgstr "تقویم پیوست شده معتبر نیست"
 
-#: ../src/modules/itip-formatter/itip-view.c:5636
-#: ../src/modules/itip-formatter/itip-view.c:5649
+#: ../src/modules/itip-formatter/itip-view.c:5701
+#: ../src/modules/itip-formatter/itip-view.c:5714
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "پیام ادعا می‌کند حاوی یک تقویم است، اما تقویم یک آی‌کلندر استاندارد نیست."
 
-#: ../src/modules/itip-formatter/itip-view.c:5731
-#: ../src/modules/itip-formatter/itip-view.c:5815
-#: ../src/modules/itip-formatter/itip-view.c:5919
+#: ../src/modules/itip-formatter/itip-view.c:5796
+#: ../src/modules/itip-formatter/itip-view.c:5880
+#: ../src/modules/itip-formatter/itip-view.c:5984
 msgid "The item in the calendar is not valid"
 msgstr "مورد داخل تقویم معتبر نیست"
 
-#: ../src/modules/itip-formatter/itip-view.c:5732
-#: ../src/modules/itip-formatter/itip-view.c:5816
-#: ../src/modules/itip-formatter/itip-view.c:5920
+#: ../src/modules/itip-formatter/itip-view.c:5797
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5985
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, tasks or "
 "free/busy information"
 msgstr ""
 "پیام شامل یک تقویم است اما تقویم شامل هیچ اتفاق، تکلیف، یا اطلاعات آزاد/مشغول نیست"
 
-#: ../src/modules/itip-formatter/itip-view.c:5825
+#: ../src/modules/itip-formatter/itip-view.c:5890
 msgid "The calendar attached contains multiple items"
 msgstr "تقویم پیوست شده حاوی موارد متعددی است"
 
-#: ../src/modules/itip-formatter/itip-view.c:5826
+#: ../src/modules/itip-formatter/itip-view.c:5891
 msgid ""
 "To process all of these items, the file should be saved and the calendar imported"
 msgstr "برای پردازش همهٔ این موارد،‌ پرونده باید ذخیره شود و تقویم وارد شود"
 
-#: ../src/modules/itip-formatter/itip-view.c:6413
+#: ../src/modules/itip-formatter/itip-view.c:6471
 msgctxt "cal-itip"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/modules/itip-formatter/itip-view.c:6431
+#: ../src/modules/itip-formatter/itip-view.c:6493
 msgid "Tentatively Accepted"
 msgstr "به طور احتمالی پذیرفته شد"
 
@@ -24522,35 +25199,40 @@ msgstr "این جلسه واگذار شده است"
 msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr "«{0}» جلسه را واگذار کرده است. آیا مایلید نمایندهٔ «{1}» را اضافه کنید؟"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:297
 msgid "Google Features"
 msgstr "ویژگی‌های گوگل"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
-msgid "Add Google Ca_lendar to this account"
-msgstr ""
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:306
+#, fuzzy
+#| msgid "Calendar and Tasks Settings"
+msgid "Add Ca_lendar to this account"
+msgstr "تنظیمات تقویم و تکلیف‌ها"
 
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
-msgid "Add Google Con_tacts to this account"
-msgstr ""
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:285
+#, fuzzy
+#| msgid "Change the properties of this folder"
+msgid "Add Con_tacts to this account"
+msgstr "تغییر ویژگی‌های این شاخه"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:326
 msgctxt "GoggleSummary"
 msgid "IMAP access"
 msgstr "دسترسی IMAP"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:329
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "تقویم‌ها برای همگام‌سازی"
 
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:332
 #, c-format
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
@@ -24630,8 +25312,8 @@ msgstr ""
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
-#: ../src/plugins/mail-notification/mail-notification.c:1220
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:194
+#: ../src/plugins/mail-notification/mail-notification.c:1271
 msgid "Configuration"
 msgstr "پیکربندی"
 
@@ -24708,14 +25390,14 @@ msgstr "کارساز به تأیید هویت نیاز دارد"
 msgid "T_ype:"
 msgstr "_گونه:"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:252
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:268
 msgid "Yahoo! Features"
 msgstr "ویژگی‌های یاهو"
 
-#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:261
+#: ../src/modules/mail-config/e-mail-config-yahoo-summary.c:277
 #, fuzzy
 #| msgid "Calendar and Tasks Settings"
-msgid "Add Yahoo! Ca_lendar and Tasks to this account"
+msgid "Add Ca_lendar and Tasks to this account"
 msgstr "تنظیمات تقویم و تکلیف‌ها"
 
 #: ../src/modules/mail/e-mail-attachment-handler.c:644
@@ -24725,96 +25407,96 @@ msgid_plural "%d attached messages"
 msgstr[0] "%Id پیام پیوست شده"
 msgstr[1] "%Id پیام پیوست شده"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:399
+#: ../src/modules/mail/e-mail-shell-backend.c:420
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "پیام _نامه‌ای"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:401
+#: ../src/modules/mail/e-mail-shell-backend.c:422
 msgid "Compose a new mail message"
 msgstr "نگارش یک پیام نامه‌ای جدید"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:409
+#: ../src/modules/mail/e-mail-shell-backend.c:430
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "_حساب‌های نامه"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:411
+#: ../src/modules/mail/e-mail-shell-backend.c:432
 #, fuzzy
 #| msgid "Create a new mail folder"
 msgid "Create a new mail account"
 msgstr "ایجاد یک شاخهٔ نامهٔ جدید"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:416
+#: ../src/modules/mail/e-mail-shell-backend.c:437
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_‌شاخهٔ نامه"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:418
+#: ../src/modules/mail/e-mail-shell-backend.c:439
 msgid "Create a new mail folder"
 msgstr "ایجاد یک شاخهٔ نامهٔ جدید"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:782
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:981
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "پایه"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:785
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:984
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "پیوند شبکه"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:788
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:987
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "مدیر شبکه"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:818
+#: ../src/modules/mail/e-mail-shell-backend.c:1018
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "روش تشخیص وضعیت _برخطی:"
 
 #. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
-#: ../src/modules/mail/e-mail-shell-backend.c:829
+#: ../src/modules/mail/e-mail-shell-backend.c:1029
 #, c-format
 msgctxt "NetworkMonitor"
 msgid "Default (%s)"
 msgstr "پیش‌گزیده (%s)"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:833
+#: ../src/modules/mail/e-mail-shell-backend.c:1033
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "پیش‌گزیده"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:1050
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "همیشه برخط"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:919
+#: ../src/modules/mail/e-mail-shell-backend.c:1119
 msgid "Mail Preferences"
 msgstr "ترجیحات نامه"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:928
+#: ../src/modules/mail/e-mail-shell-backend.c:1128
 msgid "Composer Preferences"
 msgstr "ترجیحات نگارشگر"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:937
+#: ../src/modules/mail/e-mail-shell-backend.c:1137
 #, fuzzy
 msgid "Network Preferences"
 msgstr "تر_جیحات"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1298
+#: ../src/modules/mail/e-mail-shell-backend.c:1498
 msgctxt "label"
 msgid "None"
 msgstr "هیچ‌کدام"
@@ -24823,513 +25505,513 @@ msgstr "هیچ‌کدام"
 msgid "Marking messages as read…"
 msgstr "در حال علامت‌گذاری پیام‌ها به عنوان خوانده‌شده…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Go to Folder"
 msgstr "رفتن به شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1256
 msgid "_Select"
 msgstr "_گزینش"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "از _کار انداختن حساب"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "از کار انداختن این حساب"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1575
 #, fuzzy
 #| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "حذف همیشگی همهٔ پیام‌های حذف شده از همهٔ شاخه‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1580
 #, fuzzy
 #| msgid "Not Junk"
 msgid "Empty _Junk"
 msgstr "آشغال نیست"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1582
 #, fuzzy
 #| msgid "Permanently remove all deleted messages from all folders"
 msgid "Delete all Junk messages from all folders"
 msgstr "حذف همیشگی همهٔ پیام‌های حذف شده از همهٔ شاخه‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1589
 #, fuzzy
 #| msgid "Change the properties of this folder"
 msgid "Edit properties of this account"
 msgstr "تغییر ویژگی‌های این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1596
 #, fuzzy
 #| msgid "Change the properties of this folder"
 msgid "Refresh list of folders of this account"
 msgstr "تغییر ویژگی‌های این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1601
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1603
 #, fuzzy
 #| msgid "The memo list is not marked for offline usage"
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "فهرست یادداشت برای استفادهٔ برون‌خط علامت نخورده است"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1608
 #, fuzzy
 #| msgid "Outbox"
 msgid "Fl_ush Outbox"
 msgstr "ارسالی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1615
 msgid "_Copy Folder To…"
 msgstr "_رونوشت از شاخه در…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Copy the selected folder into another folder"
 msgstr "رونوشت از شاخهٔ انتخاب شده در یک شاخهٔ دیگر"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove this folder"
 msgstr "حذف همیشگی این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Edit Sort _Order…"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 #, fuzzy
 #| msgid "Moving folder %s"
 msgid "Change sort order of the folders in the folder tree"
 msgstr "در حال جابه‌جایی شاخهٔ %s"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1636
 msgid "E_xpunge"
 msgstr "_پاک‌سازی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "حذف همیشگی تمام پیام‌های حذف شده از این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1643
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
 msgid "Mar_k All Messages as Read"
 msgstr "_علامت‌گذاری همهٔ پیام‌ها به عنوان خوانده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 #, fuzzy
 #| msgid "Mark all messages as read"
 msgid "Mark all messages in the folder as read"
 msgstr "علامت‌گذاری همهٔ پیام‌ها به عنوان خوانده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
 msgid "_Move Folder To…"
 msgstr "_جابه‌جایی شاخه به…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
 msgid "Move the selected folder into another folder"
 msgstr "جابه‌جایی شاخه‌های انتخاب شده به یک شاخهٔ دیگر"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_New…"
 msgstr "_جدید…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Create a new folder for storing mail"
 msgstr "ایجاد یک شاخهٔ جدید برای ذخیرهٔ نامه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the properties of this folder"
 msgstr "تغییر ویژگی‌های این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1674
 #, fuzzy
 #| msgid "Refreshing folder"
 msgid "Refresh the folder"
 msgstr "در حال نوسازی شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Change the name of this folder"
 msgstr "تغییر نام این شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1686
 msgid "Select Message _Thread"
 msgstr "انتخاب _رشتهٔ پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Select all messages in the same thread as the selected message"
 msgstr "انتخاب همهٔ پیام‌های هم‌رشتهٔ پیام انتخاب شده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1693
 #, fuzzy
 #| msgid "Select Message _Thread"
 msgid "Select Message S_ubthread"
 msgstr "انتخاب _رشتهٔ پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1695
 #, fuzzy
 #| msgid "Select all messages in the same thread as the selected message"
 msgid "Select all replies to the currently selected message"
 msgstr "انتخاب همهٔ پیام‌های هم‌رشتهٔ پیام انتخاب شده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1707
 msgid "Empty _Trash"
 msgstr "خالی کردن _زباله‌دان"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 #, fuzzy
 #| msgid "Permanently remove all deleted messages from all folders"
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "حذف همیشگی همهٔ پیام‌های حذف شده از همهٔ شاخه‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
 msgid "Go to _Folder"
 msgstr "رفتن به _شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 #, fuzzy
 #| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "برای انتخاب شاخه‌ها برای پست کردن به آن‌ها اینجا کلیک کنید"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
 #, fuzzy
 #| msgid "_Subscriptions"
 msgid "_Manage Subscriptions"
 msgstr "آ_بونمان‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "مشترک شدن یا لغو اشتراک شاخه‌هایی در کارسازهای دوردست"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
 msgid "Send / _Receive"
 msgstr "ارسال / _دریافت"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Send queued items and retrieve new items"
 msgstr "ارسال موارد در نوبت و بازیابی موارد جدید"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
 #, fuzzy
 #| msgid "Remove All"
 msgid "R_eceive All"
 msgstr "حذف همه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
 msgid "_Send All"
 msgstr "_فرستادن همه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 #, fuzzy
 #| msgid "Send queued items and retrieve new items"
 msgid "Send queued items in all accounts"
 msgstr "ارسال موارد در نوبت و بازیابی موارد جدید"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Cancel the current mail operation"
 msgstr "انصراف از عملیات نامه‌ای فعلی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Collapse All _Threads"
 msgstr "جمع کردن همهٔ _رشته‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
 msgid "Collapse all message threads"
 msgstr "جمع کردن همهٔ رشته‌های پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1798
 msgid "E_xpand All Threads"
 msgstr "_باز کردن همهٔ رشته‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Expand all message threads"
 msgstr "باز کردن همهٔ رشته‌های پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1805
 msgid "_Message Filters"
 msgstr "صافی‌های _پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Create or edit rules for filtering new mail"
 msgstr "ایجاد یا ویرایش قواعد صافی کردن نامه‌های جدید"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1812
 msgid "_Subscriptions…"
 msgstr "_اشتراک‌ها…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
 msgid "F_older"
 msgstr "_شاخه"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1838
 msgid "C_reate Search Folder From Search…"
 msgstr "ایجاد _شاخهٔ جست‌وجو از جست‌وجو…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1845
 msgid "Search F_olders"
 msgstr "شاخه‌های _جست‌وجو"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1847
 #, fuzzy
 #| msgid "Create or edit Search Folder definitions"
 msgid "Create or edit search folder definitions"
 msgstr "ایجاد یا ویرایش تعاریف شاخهٔ جست‌وجو"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1890
 msgid "_New Folder…"
 msgstr "شاخهٔ _جدید…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1918
 #, fuzzy
 #| msgid "Message _Preview"
 msgid "Show Message _Preview"
 msgstr "_پیش‌نمایش پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1920
 #, fuzzy
 #| msgid "Show message preview window"
 msgid "Show message preview pane"
 msgstr "نمایش پنجرهٔ پیش‌نمایش پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show _Attachment Bar"
 msgstr "نوار _پیوست نمایش داده شود"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1928
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has attachments"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 #, fuzzy
 #| msgid "Hide _Deleted Messages"
 msgid "Show _Deleted Messages"
 msgstr "مخفی کردن پیام‌های _حذف شده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1936
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show deleted messages with a line through them"
 msgstr "نمایش پیام‌های حذف شده (به صورت خط خورده) در فهرست پیام‌ها."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 #, fuzzy
 #| msgid "Sh_ow Hidden Messages"
 msgid "Show _Junk Messages"
 msgstr "ن_شان دادن پیام‌های مخفی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1944
 #, fuzzy
 #| msgid "Show deleted messages (with a strike-through) in the message-list."
 msgid "Show junk messages with a red line through them"
 msgstr "نمایش پیام‌های حذف شده (به صورت خط خورده) در فهرست پیام‌ها."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 msgid "_Group By Threads"
 msgstr "_گروه کردن از روی رشته"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1952
 #, fuzzy
 #| msgid "Threaded Message list"
 msgid "Threaded message list"
 msgstr "فهرست پیام‌های رشته شده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 #, fuzzy
 #| msgid "Show Full VCard"
 msgid "Show To _Do Bar"
 msgstr "نمایش کارت مجازی کامل"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1960
 msgid "Show To Do bar with appointments and tasks"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1968
 #, fuzzy
 #| msgid "Toggles whether the From chooser is displayed"
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "ضامن این که انتخاب‌کنندهٔ فرستنده نشان داده شود را می‌زند"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1988
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show message preview below the message list"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1995
 #, fuzzy
 #| msgid "Show deleted messages in the message-list"
 msgid "Show message preview alongside the message list"
 msgstr "نمایش پیام‌های حذف شده در فهرست پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2003
 #, fuzzy
 #| msgid "Messages"
 msgid "All Messages"
 msgstr "پیام‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 #, fuzzy
 #| msgid "Next _Important Message"
 msgid "Important Messages"
 msgstr "پیام م_هم بعدی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
 #, fuzzy
 #| msgid "Bad Task Message"
 msgid "Last 5 Days’ Messages"
 msgstr "پیام تکلیف خراب"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 #, fuzzy
 #| msgid "Message is not Junk"
 msgid "Messages Not Junk"
 msgstr "پیام‌ آشغال نیست"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
 #, fuzzy
 #| msgid "Insert Attachment"
 msgid "Messages with Attachments"
 msgstr "درج پیوست"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2038
 #, fuzzy
 #| msgid "Insert Attachment"
 msgid "Messages with Notes"
 msgstr "درج پیوست"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2045
 #, fuzzy
 #| msgid "Label"
 msgid "No Label"
 msgstr "برچسب"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2052
 msgid "Read Messages"
 msgstr "پیام‌های خوانده‌شده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2059
 msgid "Unread Messages"
 msgstr "پیام‌های خوانده‌نشده"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2066
 #, fuzzy
 #| msgid "Message Header"
 msgid "Message Thread"
 msgstr "سرنامهٔ پیام"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 #, fuzzy
 #| msgid "Subject or Sender contains"
 msgid "Subject or Addresses contain"
 msgstr "موضوع یا فرستنده حاوی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2136
 #, fuzzy
 #| msgid "Mail Accounts"
 msgid "All Accounts"
 msgstr "حساب‌های نامه‌ای"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2143
 #, fuzzy
 #| msgid "Source Account"
 msgid "Current Account"
 msgstr "حساب مبدأ"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2150
 #, fuzzy
 #| msgid "Create _vFolder"
 msgid "Current Folder"
 msgstr "ایجاد شاخهٔ _مجازی"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2157
 #, fuzzy
 #| msgid "Create subfolders"
 msgid "Current Folder and Subfolders"
 msgstr "ایجاد زیرشاخه‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view.c:895
+#: ../src/modules/mail/e-mail-shell-view.c:1039
 #, fuzzy
 #| msgid "Create subfolders"
 msgid "Current Folder and Subfolders Search"
 msgstr "ایجاد زیرشاخه‌ها"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1017
+#: ../src/modules/mail/e-mail-shell-view.c:1159
 #, fuzzy
 #| msgid "Hula Account Setup"
 msgid "All Account Search"
 msgstr "برپاسازی حساب Hula"
 
-#: ../src/modules/mail/e-mail-shell-view.c:1127
+#: ../src/modules/mail/e-mail-shell-view.c:1267
 #, fuzzy
 #| msgid "Account name"
 msgid "Account Search"
 msgstr "نام حساب"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:909
+#: ../src/modules/mail/e-mail-shell-view-private.c:930
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%Id گزیده، "
 msgstr[1] "%d گزیده، "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:924
-#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:945
+#: ../src/modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "‫%d حذف شد"
 msgstr[1] "‫%d حذف شد"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:955
-#: ../src/modules/mail/e-mail-shell-view-private.c:961
+#: ../src/modules/mail/e-mail-shell-view-private.c:976
+#: ../src/modules/mail/e-mail-shell-view-private.c:982
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "‫%d جفنگ"
 msgstr[1] "‫%d جفنگ"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
+#: ../src/modules/mail/e-mail-shell-view-private.c:989
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "‫%d پیش‌نویس"
 msgstr[1] "‫%d پیش‌نویس"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:974
+#: ../src/modules/mail/e-mail-shell-view-private.c:995
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "‫%d ارسال نشده"
 msgstr[1] "‫%d ارسال نشده"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:980
+#: ../src/modules/mail/e-mail-shell-view-private.c:1001
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "‫%d ارسال شده"
 msgstr[1] "‫%d ارسال شده"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:997
+#: ../src/modules/mail/e-mail-shell-view-private.c:1018
 #, fuzzy, c-format
 #| msgid "%d unread, "
 #| msgid_plural "%d unread, "
@@ -25338,96 +26020,97 @@ msgid_plural "%d unread"
 msgstr[0] "‫%d خوانده نشده"
 msgstr[1] "‫%d خوانده نشده"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1515
+#: ../src/modules/mail/e-mail-shell-view-private.c:1536
 msgid "Send / Receive"
 msgstr "ارسال / دریافت"
 
-#: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/mail/em-composer-prefs.c:417
 #, fuzzy
 #| msgid "Select Folder"
 msgid "Select Folder to Add"
 msgstr "انتخاب شاخه"
 
-#: ../src/modules/mail/em-composer-prefs.c:896
+#: ../src/modules/mail/em-composer-prefs.c:893
 msgid "Folder"
 msgstr "شاخه"
 
-#: ../src/modules/mail/em-composer-prefs.c:932
+#: ../src/modules/mail/em-composer-prefs.c:929
 msgid "Recipient"
 msgstr "گیرنده"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1220
 #, fuzzy
 #| msgid "_Save to Outbox"
 msgid "Keep in Outbox"
 msgstr "ذخیره در صندوق خروجی"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1221
 #, fuzzy
 #| msgid "_Send message"
 msgid "Send immediately"
 msgstr "_ارسال پیام"
 
-#: ../src/modules/mail/em-composer-prefs.c:1225
+#: ../src/modules/mail/em-composer-prefs.c:1222
 #, fuzzy
 #| msgid "15 minutes"
 msgid "Send after 5 minutes"
 msgstr "۱۵ دقیقه"
 
-#: ../src/modules/mail/em-composer-prefs.c:1310
+#: ../src/modules/mail/em-composer-prefs.c:1307
 msgid "Language(s)"
 msgstr "زبان‌ها"
 
-#: ../src/modules/mail/em-composer-prefs.c:1340
+#: ../src/modules/mail/em-composer-prefs.c:1337
 msgid "Same as user interface"
 msgstr ""
 
-#: ../src/modules/mail/em-mailer-prefs.c:77
+#: ../src/modules/mail/em-mailer-prefs.c:88
 #, fuzzy
 #| msgid "Every time"
 msgid "On exit, every time"
 msgstr "هر بار"
 
-#: ../src/modules/mail/em-mailer-prefs.c:78
+#: ../src/modules/mail/em-mailer-prefs.c:89
 #, fuzzy
 #| msgid "Once per day"
 msgid "Once per day"
 msgstr "روزی یک بار"
 
-#: ../src/modules/mail/em-mailer-prefs.c:79
+#: ../src/modules/mail/em-mailer-prefs.c:90
 #, fuzzy
 #| msgid "Once per week"
 msgid "Once per week"
 msgstr "هفته‌ای یک بار"
 
-#: ../src/modules/mail/em-mailer-prefs.c:80
+#: ../src/modules/mail/em-mailer-prefs.c:91
 #, fuzzy
 #| msgid "Once per month"
 msgid "Once per month"
 msgstr "ماهی یک بار"
 
-#: ../src/modules/mail/em-mailer-prefs.c:81
+#: ../src/modules/mail/em-mailer-prefs.c:92
 #, fuzzy
 #| msgid "Immediately follow each other"
 msgid "Immediately, on folder leave"
 msgstr "بلافاصله پشت سر هم"
 
-#: ../src/modules/mail/em-mailer-prefs.c:436
+#: ../src/modules/mail/em-mailer-prefs.c:466
+#: ../src/modules/mail/em-mailer-prefs.c:2044
 msgid "Header"
 msgstr "سرصفحه"
 
-#: ../src/modules/mail/em-mailer-prefs.c:440
+#: ../src/modules/mail/em-mailer-prefs.c:470
 #, fuzzy
 #| msgid "Continue"
 msgid "Contains Value"
 msgstr "ادامه"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1699
+#: ../src/modules/mail/em-mailer-prefs.c:2073
 msgid "_Date header:"
 msgstr "سرایند _تاریخ:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1700
+#: ../src/modules/mail/em-mailer-prefs.c:2074
 #, fuzzy
 #| msgid "Show _Original Size"
 msgid "Show _original header value"
@@ -25513,33 +26196,27 @@ msgstr ""
 msgid "Author(s)"
 msgstr "مؤلف(ها)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
-msgid "Plugin Manager"
-msgstr "مدیر متصل شونده‌ها"
-
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:301
 msgid "Note: Some changes will not take effect until restart"
 msgstr "توجه: بعضی از تغییرات تا زمان راه‌اندازی مجدد مؤثر نخواهند بود"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:331
 #, fuzzy
 #| msgid "Review"
 msgid "Overview"
 msgstr "مرور"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:402
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Plugin"
 msgstr "متصل شونده"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
-msgid "_Plugins"
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:516
+#, fuzzy
+#| msgid "_Plugins"
+msgid "Plugins"
 msgstr "_متصل شونده‌ها"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
-msgid "Enable and disable plugins"
-msgstr "به کار انداختن و از کار انداختن متصل شونده‌ها"
-
 #: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
 #, fuzzy
 #| msgid "Display the next message"
@@ -25562,50 +26239,50 @@ msgstr ""
 msgid "Display HTML version of multipart/alternative message"
 msgstr "نمایش پیام مهم قبلی"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:69
 #: ../src/modules/prefer-plain/plugin/config-ui.c:35
 msgid "Show HTML if present"
 msgstr "نمایش HTML در صورت وجود"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:70
 #: ../src/modules/prefer-plain/plugin/config-ui.c:36
 msgid "Let Evolution choose the best part to show."
 msgstr ""
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:73
 #: ../src/modules/prefer-plain/plugin/config-ui.c:39
 #, fuzzy
 #| msgid "Show HTML if present"
 msgid "Show plain text if present"
 msgstr "نمایش HTML در صورت وجود"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:74
 #: ../src/modules/prefer-plain/plugin/config-ui.c:40
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best part to "
 "show."
 msgstr ""
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../src/modules/prefer-plain/plugin/config-ui.c:44
 #, fuzzy
 #| msgid "Show HTML if present"
 msgid "Show plain text if present, or HTML source"
 msgstr "نمایش HTML در صورت وجود"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../src/modules/prefer-plain/plugin/config-ui.c:45
 msgid "Show plain text part, if present, otherwise the HTML part source."
 msgstr ""
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:91
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../src/modules/prefer-plain/plugin/config-ui.c:49
 #, fuzzy
 #| msgid "Only ever show PLAIN"
 msgid "Only ever show plain text"
 msgstr "نمایش فقط و فقط متن ساده"
 
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:92
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:84
 #: ../src/modules/prefer-plain/plugin/config-ui.c:50
 msgid ""
 "Always show plain text part and make attachments from other parts, if requested."
@@ -25689,19 +26366,19 @@ msgstr ""
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:271
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:336
 msgid "Importing Files"
 msgstr "در حال وارد کردن پرونده‌ها"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:253
 msgid "Import cancelled."
 msgstr "درون‌ریزی لغو شد."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:270
 msgid "Import complete."
 msgstr "درون‌ریزی کامل‌شد."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:186
+#: ../src/modules/startup-wizard/e-startup-assistant.c:174
 #, fuzzy
 #| msgid ""
 #| "Welcome to Evolution. The next few screens will allow Evolution to connect to "
@@ -25719,12 +26396,12 @@ msgstr ""
 "\n"
 "لطفاً برای ادامه روی دکمهٔ «جلو» کلیک کنید."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+#: ../src/modules/startup-wizard/e-startup-assistant.c:181
 msgid "Do not _show this wizard again"
 msgstr "دیگر این گفت‌وگو نشان داده نشود"
 
 #. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#: ../src/modules/startup-wizard/e-startup-assistant.c:194
 #, fuzzy
 #| msgid "Create a new mail folder"
 msgctxt "wizard-ca-note"
@@ -25732,7 +26409,7 @@ msgid "create a collection account"
 msgstr "ایجاد یک شاخهٔ نامهٔ جدید"
 
 #. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
-#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#: ../src/modules/startup-wizard/e-startup-assistant.c:196
 #, c-format
 msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
@@ -26020,7 +26697,7 @@ msgid "_Do not show this message again."
 msgstr "این پیام دیگر نشان داده نشود."
 
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:571
-#: ../src/plugins/templates/templates.c:489
+#: ../src/plugins/templates/templates.c:495
 msgid "Keywords"
 msgstr "کلیدواژگان"
 
@@ -26041,6 +26718,7 @@ msgid "_Add Attachment..."
 msgstr "_افزودن پیوست…"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:3
 msgid "_Edit Message"
 msgstr "_ویرایش پیام"
 
@@ -26183,23 +26861,23 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "هیچ‌کدام"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:538
+#: ../src/plugins/email-custom-header/email-custom-header.c:528
 msgid "_Custom Header"
 msgstr "سرایند _سفارشی"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:808
+#: ../src/plugins/email-custom-header/email-custom-header.c:795
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
 msgstr ""
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:862
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 msgid "Key"
 msgstr "کلید"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:879
-#: ../src/plugins/templates/templates.c:498
+#: ../src/plugins/email-custom-header/email-custom-header.c:866
+#: ../src/plugins/templates/templates.c:504
 msgid "Values"
 msgstr "مقدارها"
 
@@ -26218,24 +26896,24 @@ msgstr ""
 msgid "Email Custom Header"
 msgstr "سرایند سفارشی رایانامه"
 
-#: ../src/plugins/external-editor/external-editor.c:111
+#: ../src/plugins/external-editor/external-editor.c:108
 msgid "Command to be executed to launch the editor: "
 msgstr ""
 
-#: ../src/plugins/external-editor/external-editor.c:112
+#: ../src/plugins/external-editor/external-editor.c:109
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
 msgstr ""
 
-#: ../src/plugins/external-editor/external-editor.c:122
+#: ../src/plugins/external-editor/external-editor.c:119
 #, fuzzy
 #| msgid "Automatically check for _new mail every"
 msgid "_Automatically launch when a new mail is edited"
 msgstr "گشتن خودکار به دنبال نامهٔ _جدید در هر"
 
-#: ../src/plugins/external-editor/external-editor.c:455
-#: ../src/plugins/external-editor/external-editor.c:457
+#: ../src/plugins/external-editor/external-editor.c:489
+#: ../src/plugins/external-editor/external-editor.c:491
 msgid "Compose in External Editor"
 msgstr "ایجاد در ویرایشگر خارجی"
 
@@ -26499,7 +27177,7 @@ msgid ""
 msgstr ""
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:462
+#: ../src/plugins/mail-notification/mail-notification.c:500
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -26508,29 +27186,37 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:471
+#: ../src/plugins/mail-notification/mail-notification.c:509
 #, c-format
 msgid "From: %s"
 msgstr "از: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:485
+#: ../src/plugins/mail-notification/mail-notification.c:517
 #, fuzzy, c-format
 #| msgid "Subject is %s"
 msgid "Subject: %s"
 msgstr "موضوع %s باشد"
 
+#. Translators: The '%s' is replaced by the folder name, where a new
+#. * mail message arrived. Example: "Folder: On This Computer : Inbox"
+#: ../src/plugins/mail-notification/mail-notification.c:525
+#, fuzzy, c-format
+#| msgid "vFolders"
+msgid "Folder: %s"
+msgstr "پوشه‌های مجازی"
+
 #. Translators: %d is the count of mails received in addition
 #. * to the one displayed in this notification.
-#: ../src/plugins/mail-notification/mail-notification.c:501
+#: ../src/plugins/mail-notification/mail-notification.c:536
 #, c-format
 msgid "(and %d more)"
 msgid_plural "(and %d more)"
 msgstr[0] "(و %Id بیش‌تر)"
 msgstr[1] "(و %Id بیش‌تر)"
 
-#: ../src/plugins/mail-notification/mail-notification.c:513
+#: ../src/plugins/mail-notification/mail-notification.c:542
 #, fuzzy
 #| msgid "New mail notify"
 msgid "New email in Evolution"
@@ -26538,62 +27224,62 @@ msgstr "اعلان نامهٔ جدید"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:553
+#: ../src/plugins/mail-notification/mail-notification.c:583
 #, fuzzy, c-format
 #| msgid "Show Fields"
 msgid "Show %s"
 msgstr "نمایش فیلدها"
 
-#: ../src/plugins/mail-notification/mail-notification.c:792
+#: ../src/plugins/mail-notification/mail-notification.c:843
 #, fuzzy
 #| msgid "Play sound file when new mail arri_ves"
 msgid "_Play sound when a new message arrives"
 msgstr "پخش پروندهٔ صدا هنگامی که نامهٔ جدیدی می‌رسد"
 
-#: ../src/plugins/mail-notification/mail-notification.c:824
+#: ../src/plugins/mail-notification/mail-notification.c:875
 #, fuzzy
 #| msgid "Beep"
 msgid "_Beep"
 msgstr "بوق"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:888
 #, fuzzy
 #| msgid "Use underline"
 msgid "Use sound _theme"
 msgstr "استفاده از زیرخط"
 
-#: ../src/plugins/mail-notification/mail-notification.c:856
+#: ../src/plugins/mail-notification/mail-notification.c:907
 #, fuzzy
 #| msgid "Search _filter:"
 msgid "Play _file:"
 msgstr "_صافی جست‌وجو:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:865
+#: ../src/plugins/mail-notification/mail-notification.c:916
 msgid "Select sound file"
 msgstr "یک پرونده صوتی انتخاب کنید"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1014
+#: ../src/plugins/mail-notification/mail-notification.c:1065
 msgid "Select _accounts for which enable notifications:"
 msgstr "گزینش حساب‌هایی که برایشان آگاهی‌ها به کار بیفتند:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/mail-notification.c:1227
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 #, fuzzy
 #| msgid "New Mail Notification"
 msgid "Mail Notification"
 msgstr "اطلاع نامهٔ جدید"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1190
+#: ../src/plugins/mail-notification/mail-notification.c:1241
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../src/plugins/mail-notification/mail-notification.c:1206
+#: ../src/plugins/mail-notification/mail-notification.c:1257
 #, fuzzy
 #| msgid "_Do not notify me when new mail arrives"
 msgid "Show _notification when a new message arrives"
 msgstr "هنگامی که نامهٔ جدیدی می‌رسد به من اعلام _نشود"
 
-#: ../src/plugins/mail-notification/mail-notification.c:1224
+#: ../src/plugins/mail-notification/mail-notification.c:1275
 msgid "Accounts"
 msgstr "حساب"
 
@@ -26610,44 +27296,44 @@ msgid "Created from a mail by %s"
 msgstr ""
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:600
+#: ../src/plugins/mail-to-task/mail-to-task.c:598
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_لغو"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:602
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_ویرایش"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_جدید"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:622
+#: ../src/plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the old "
 "event?"
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:625
+#: ../src/plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the old task?"
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:628
+#: ../src/plugins/mail-to-task/mail-to-task.c:626
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the old memo?"
 msgstr ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:648
+#: ../src/plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to add "
@@ -26659,7 +27345,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:655
+#: ../src/plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to add "
@@ -26671,7 +27357,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:662
+#: ../src/plugins/mail-to-task/mail-to-task.c:660
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to add "
@@ -26682,92 +27368,92 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:683
+#: ../src/plugins/mail-to-task/mail-to-task.c:681
 #, fuzzy
 #| msgid "Do you wish to overwrite it?"
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "آیا می‌خواهید آن را رونویسی کنید؟"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:759
+#: ../src/plugins/mail-to-task/mail-to-task.c:756
 msgid "[No Summary]"
 msgstr "[بدون خلاصه]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:772
+#: ../src/plugins/mail-to-task/mail-to-task.c:769
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:826
+#: ../src/plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:877
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 #, fuzzy, c-format
 #| msgid "Can not open file"
 msgid "Cannot open calendar. %s"
 msgstr "نمی‌توان پرونده را باز کرد"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:881
+#: ../src/plugins/mail-to-task/mail-to-task.c:878
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:884
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other task "
 "list, please."
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:887
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other memo "
 "list, please."
 msgstr ""
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1328
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 #, fuzzy
 #| msgid "Create a new appointment"
 msgid "Create an _Appointment"
 msgstr "ایجاد یک قرار جدید"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1330
+#: ../src/plugins/mail-to-task/mail-to-task.c:1327
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new event from the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1335
+#: ../src/plugins/mail-to-task/mail-to-task.c:1332
 #, fuzzy
 #| msgid "Create a new memo"
 msgid "Create a Mem_o"
 msgstr "ایجاد یک یادداشت جدید"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1337
+#: ../src/plugins/mail-to-task/mail-to-task.c:1334
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new memo from the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1342
+#: ../src/plugins/mail-to-task/mail-to-task.c:1339
 #, fuzzy
 #| msgid "Create a new task"
 msgid "Create a _Task"
 msgstr "ایجاد یک تکلیف جدید"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1344
+#: ../src/plugins/mail-to-task/mail-to-task.c:1341
 #, fuzzy
 #| msgid "Compose a reply to the sender of the selected message"
 msgid "Create a new task from the selected message"
 msgstr "نگارش پاسخ برای فرستندهٔ پیام انتخاب شده"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1352
+#: ../src/plugins/mail-to-task/mail-to-task.c:1349
 #, fuzzy
 #| msgid "New _Meeting"
 msgid "Create a _Meeting"
 msgstr "_جلسهٔ جدید"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1354
+#: ../src/plugins/mail-to-task/mail-to-task.c:1351
 #, fuzzy
 #| msgid "Create a new meeting request"
 msgid "Create a new meeting from the selected message"
@@ -26867,7 +27553,7 @@ msgstr ""
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/publish-calendar/publish-calendar.c:787
 #, fuzzy
 #| msgid "Are you sure you want to remove this URL?"
 msgid "Are you sure you want to remove this location?"
@@ -26876,13 +27562,13 @@ msgstr "آیا مطمينید که می‌خواهید این URL را حذف ک
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1098
+#: ../src/plugins/publish-calendar/publish-calendar.c:1097
 #, fuzzy
 #| msgid "Could not create pipe: %s"
 msgid "Could not create publish thread."
 msgstr "ایجاد لوله مفدور نیست: %s"
 
-#: ../src/plugins/publish-calendar/publish-calendar.c:1108
+#: ../src/plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_انتشار اطلاعات تقویم"
 
@@ -26977,11 +27663,11 @@ msgstr "مکان انتشار"
 msgid "Invalid source UID “%s”"
 msgstr "شاخهٔ نامعتبر: «%s»"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "موقعیت جدید"
 
-#: ../src/plugins/publish-calendar/url-editor-dialog.c:544
+#: ../src/plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "ویرایش موقعیت"
 
@@ -27095,36 +27781,78 @@ msgstr ""
 msgid "RDF (.rdf)"
 msgstr "RDF ‏(.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:116
+#: ../src/plugins/save-calendar/save-calendar.c:114
 msgid "_Format:"
 msgstr "_قالب‌بندی:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:183
+#: ../src/plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "انتخاب  پروندهٔ مقصد"
 
-#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/plugins/save-calendar/save-calendar.c:184
 msgid "_Save As"
 msgstr "_ذخیره با نام"
 
-#: ../src/plugins/save-calendar/save-calendar.c:346
+#: ../src/plugins/save-calendar/save-calendar.c:343
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected calendar to disk"
 msgstr "ذخیرهٔ تقویم را فرست تکلیف‌های انتخاب شده روی دیسک."
 
-#: ../src/plugins/save-calendar/save-calendar.c:385
+#: ../src/plugins/save-calendar/save-calendar.c:382
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected memo list to disk"
 msgstr "ذخیرهٔ تقویم را فرست تکلیف‌های انتخاب شده روی دیسک."
 
-#: ../src/plugins/save-calendar/save-calendar.c:424
+#: ../src/plugins/save-calendar/save-calendar.c:421
 #, fuzzy
 #| msgid "Saves selected calendar or tasks list to disk."
 msgid "Save the selected task list to disk"
 msgstr "ذخیرهٔ تقویم را فرست تکلیف‌های انتخاب شده روی دیسک."
 
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:1
+#, fuzzy
+#| msgid "Select a location"
+msgid "Sender Validation"
+msgstr "یک مکان انتخاب کنید"
+
+#: ../src/plugins/sender-validation/org-gnome-evolution-sender-validation.eplug.xml.h:2
+msgid ""
+"Validates sender before sending an e-mail against a list of recipients and for "
+"them assigned expected send account."
+msgstr ""
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:1
+#, fuzzy
+#| msgid "Add Sender to Address Book"
+msgid "Confirm sender address"
+msgstr "اضافه کردن فرستنده به دفترچهٔ نشانی"
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:2
+msgid ""
+"The message contains recipient “{0}” for which it is set up to use sender account "
+"“{1}”, but the account “{2}” is used instead."
+msgstr ""
+
+#: ../src/plugins/sender-validation/org-gnome-sender-validation.error.xml.h:4
+#, fuzzy
+#| msgid "_Send All"
+msgid "_Send Anyway"
+msgstr "_فرستادن همه"
+
+#: ../src/plugins/sender-validation/sender-validation.c:520
+#, fuzzy
+#| msgid "Recipients contain"
+msgid "Recipient Contains"
+msgstr "گیرنده‌ حاوی"
+
+#: ../src/plugins/sender-validation/sender-validation.c:530
+#, fuzzy
+#| msgid "Accounts"
+msgid "Account to Use"
+msgstr "حساب"
+
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
@@ -27132,51 +27860,51 @@ msgid ""
 "which will be replaced by values from an email you are replying to."
 msgstr ""
 
-#: ../src/plugins/templates/templates.c:878
+#: ../src/plugins/templates/templates.c:887
 #, fuzzy
 #| msgid "Saving message to Outbox."
 msgid "Saving message template"
 msgstr "در حال ذخیرهٔ پیام‌ها در صندوق خروجی"
 
-#: ../src/plugins/templates/templates.c:899
+#: ../src/plugins/templates/templates.c:908
 #, fuzzy
 #| msgid "Save as draft"
 msgid "Save as _Template"
 msgstr "ذخیره به عنوان پیش‌نویس"
 
-#: ../src/plugins/templates/templates.c:901
+#: ../src/plugins/templates/templates.c:910
 #, fuzzy
 #| msgid "Save as draft"
 msgid "Save as Template"
 msgstr "ذخیره به عنوان پیش‌نویس"
 
-#: ../src/shell/e-shell.c:379
+#: ../src/shell/e-shell.c:382
 #, fuzzy
 #| msgid "Exchange Account is offline."
 msgid "Preparing to go offline…"
 msgstr "حساب اِکس‌چنج برون‌خط است."
 
-#: ../src/shell/e-shell.c:408
+#: ../src/shell/e-shell.c:411
 #, fuzzy
 #| msgid "Exchange Account is offline."
 msgid "Preparing to go online…"
 msgstr "حساب اِکس‌چنج برون‌خط است."
 
-#: ../src/shell/e-shell.c:519
+#: ../src/shell/e-shell.c:522
 msgid "Preparing to quit"
 msgstr "آماده‌سازی برای خروج"
 
-#: ../src/shell/e-shell.c:525
+#: ../src/shell/e-shell.c:528
 msgid "Preparing to quit…"
 msgstr "در حال آماده‌سازی برای خروج…"
 
-#: ../src/shell/e-shell.c:1088
+#: ../src/shell/e-shell.c:1091
 #, fuzzy
 #| msgid "Junk Settings"
 msgid "Open _Settings"
 msgstr "تنظیمات آشغال"
 
-#: ../src/shell/e-shell.c:1297
+#: ../src/shell/e-shell.c:1300
 msgid "Credentials are required to connect to the destination host."
 msgstr ""
 
@@ -27192,13 +27920,13 @@ msgstr "ذخیرهٔ جست‌وجو"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../src/shell/e-shell-searchbar.c:925
+#: ../src/shell/e-shell-searchbar.c:929
 msgid "Sho_w:"
 msgstr "_نمایش:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:951
+#: ../src/shell/e-shell-searchbar.c:955
 #, fuzzy
 #| msgid "_Search:"
 msgid "Sear_ch:"
@@ -27206,7 +27934,7 @@ msgstr "_جست‌وجو:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1019
+#: ../src/shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "_در"
 
@@ -27229,388 +27957,404 @@ msgstr "دانیال بهزادی <dani behzi gmail com>‏"
 msgid "Website"
 msgstr "پایگاه وب"
 
-#: ../src/shell/e-shell-view.c:295
+#: ../src/shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr ""
 
-#: ../src/shell/e-shell-window-actions.c:345
+#: ../src/shell/e-shell-window-actions.c:351
 msgid "Categories Editor"
 msgstr "فهرست دسته‌ها"
 
-#: ../src/shell/e-shell-window-actions.c:648
+#: ../src/shell/e-shell-window-actions.c:654
 #, fuzzy
 #| msgid "Bug buddy is not installed."
 msgid "Bug Buddy is not installed."
 msgstr "‏Bug buddy نصب نشده است."
 
-#: ../src/shell/e-shell-window-actions.c:649
+#: ../src/shell/e-shell-window-actions.c:655
 #, fuzzy
 #| msgid "Bug buddy could not be run."
 msgid "Bug Buddy could not be run."
 msgstr "اجرای Bug buddy ممکن نیست."
 
-#: ../src/shell/e-shell-window-actions.c:845
+#: ../src/shell/e-shell-window-actions.c:895
 #, fuzzy
 #| msgid "Collection"
 msgid "Collect_ion Account"
 msgstr "مجموعه"
 
-#: ../src/shell/e-shell-window-actions.c:847
+#: ../src/shell/e-shell-window-actions.c:897
 #, fuzzy
 #| msgid "Create a new mail folder"
 msgid "Create a new collection account"
 msgstr "ایجاد یک شاخهٔ نامهٔ جدید"
 
-#: ../src/shell/e-shell-window-actions.c:855
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "_About"
 msgstr "_درباره"
 
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Show information about Evolution"
 msgstr "نمایش اطلاعاتی دربارهٔ اوولوشن"
 
-#: ../src/shell/e-shell-window-actions.c:862
+#: ../src/shell/e-shell-window-actions.c:912
 #, fuzzy
 #| msgid "_Account:"
 msgid "_Accounts"
 msgstr "_حساب:"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:914
 #, fuzzy
 #| msgid "Configure Evolution"
 msgid "Configure Evolution Accounts"
 msgstr "پیکربندی اوولوشن"
 
-#: ../src/shell/e-shell-window-actions.c:869
-#: ../src/shell/e-shell-window-actions.c:883
+#: ../src/shell/e-shell-window-actions.c:919
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Close Window"
 msgstr "_بستن پنجره"
 
-#: ../src/shell/e-shell-window-actions.c:890
+#: ../src/shell/e-shell-window-actions.c:940
 msgid "_Contents"
 msgstr "_محتویات"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:942
 #, fuzzy
 #| msgid "Check Evolution archive"
 msgid "Open the Evolution User Guide"
 msgstr "بررسی آرشیو اوولوشن"
 
-#: ../src/shell/e-shell-window-actions.c:918
+#: ../src/shell/e-shell-window-actions.c:968
 msgid "I_mport…"
-msgstr "_درون‌ریزی"
+msgstr "_درون‌ریزی…"
 
-#: ../src/shell/e-shell-window-actions.c:920
+#: ../src/shell/e-shell-window-actions.c:970
 msgid "Import data from other programs"
 msgstr "وارد کردن داده‌ها از برنامه‌های دیگر"
 
-#: ../src/shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:975
 msgid "New _Window"
 msgstr "_پنجرهٔ جدید"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:977
 #, fuzzy
 #| msgid "Create a new window displaying this folder"
 msgid "Create a new window displaying this view"
 msgstr "ایجاد پنجرهٔ جدیدی که این شاخه را نمایش می‌دهد"
 
-#: ../src/shell/e-shell-window-actions.c:939
+#: ../src/shell/e-shell-window-actions.c:989
 #, fuzzy
 #| msgid "_Available Categories:"
 msgid "Available Cate_gories"
 msgstr "م_قولات موجود:"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:991
 #, fuzzy
 #| msgid "_Available Categories:"
 msgid "Manage available categories"
 msgstr "م_قولات موجود:"
 
-#: ../src/shell/e-shell-window-actions.c:953
+#: ../src/shell/e-shell-window-actions.c:1003
 msgid "_Quit"
 msgstr "_خروج"
 
-#: ../src/shell/e-shell-window-actions.c:955
+#: ../src/shell/e-shell-window-actions.c:1005
 msgid "Exit the program"
 msgstr "خروج از برنامه"
 
-#: ../src/shell/e-shell-window-actions.c:960
+#: ../src/shell/e-shell-window-actions.c:1010
+#, fuzzy
+#| msgid "Save Search"
+msgid "_Saved Searches"
+msgstr "ذخیرهٔ جست‌وجو"
+
+#: ../src/shell/e-shell-window-actions.c:1017
 #, fuzzy
 #| msgid "Advanced Search"
 msgid "_Advanced Search…"
 msgstr "جست‌وجوی پیشرفته"
 
-#: ../src/shell/e-shell-window-actions.c:962
+#: ../src/shell/e-shell-window-actions.c:1019
 msgid "Construct a more advanced search"
 msgstr ""
 
-#: ../src/shell/e-shell-window-actions.c:969
+#: ../src/shell/e-shell-window-actions.c:1026
 #, fuzzy
 #| msgid "Cancel the current mail operation"
 msgid "Clear the current search parameters"
 msgstr "انصراف از عملیات نامه‌ای فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:974
+#: ../src/shell/e-shell-window-actions.c:1031
 #, fuzzy
 #| msgid "_Edit Saved Searches..."
 msgid "_Edit Saved Searches…"
 msgstr "ویرایش جست‌وجوهای ذخیره شده..."
 
-#: ../src/shell/e-shell-window-actions.c:976
+#: ../src/shell/e-shell-window-actions.c:1033
 msgid "Manage your saved searches"
 msgstr ""
 
-#: ../src/shell/e-shell-window-actions.c:983
+#: ../src/shell/e-shell-window-actions.c:1040
 #, fuzzy
 #| msgid "Click here to attach a file"
 msgid "Click here to change the search type"
 msgstr "<برای پیوست پرونده اینجا کلیک کنید>"
 
-#: ../src/shell/e-shell-window-actions.c:988
+#: ../src/shell/e-shell-window-actions.c:1045
 msgid "_Find Now"
 msgstr "_پیدا کردن فوری"
 
-#: ../src/shell/e-shell-window-actions.c:990
+#: ../src/shell/e-shell-window-actions.c:1047
 #, fuzzy
 #| msgid "Cancel the current mail operation"
 msgid "Execute the current search parameters"
 msgstr "انصراف از عملیات نامه‌ای فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:995
+#: ../src/shell/e-shell-window-actions.c:1052
 #, fuzzy
 #| msgid "Save Search"
 msgid "_Save Search…"
 msgstr "ذخیرهٔ جست‌وجو"
 
-#: ../src/shell/e-shell-window-actions.c:997
+#: ../src/shell/e-shell-window-actions.c:1054
 #, fuzzy
 #| msgid "Save the current file"
 msgid "Save the current search parameters"
 msgstr "ذخیرهٔ پروندهٔ فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1066
 #, fuzzy
 #| msgid "_Forward Contacts"
 msgid "_Keyboard Shortcuts"
 msgstr "_ارجاع آشنایان"
 
-#: ../src/shell/e-shell-window-actions.c:1011
+#: ../src/shell/e-shell-window-actions.c:1068
 #, fuzzy
 #| msgid "Change Evolution's settings"
 msgid "Show keyboard shortcuts"
 msgstr "تغییر تنظیمات اوولوشن"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1073
+#, fuzzy
+#| msgid "Security Information"
+msgid "Show _WebKit GPU information"
+msgstr "اطلاعات امنیت"
+
+#: ../src/shell/e-shell-window-actions.c:1075
+msgid "Show WebKit GPU information page in the preview panel"
+msgstr ""
+
+#: ../src/shell/e-shell-window-actions.c:1080
 #, fuzzy
 #| msgid "Submit Bug Report"
 msgid "Submit _Bug Report…"
 msgstr "ارسال گزارش اشکال"
 
-#: ../src/shell/e-shell-window-actions.c:1018
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Submit a bug report using Bug Buddy"
 msgstr "ارسال گزارش اشکال با استفاده از Bug Buddy‏"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1087
 msgid "_Work Offline"
 msgstr "_کار برون‌خط"
 
-#: ../src/shell/e-shell-window-actions.c:1025
+#: ../src/shell/e-shell-window-actions.c:1089
 #, fuzzy
 #| msgid "Start in offline mode"
 msgid "Put Evolution into offline mode"
 msgstr "شروع با حالت برون‌خط"
 
-#: ../src/shell/e-shell-window-actions.c:1030
+#: ../src/shell/e-shell-window-actions.c:1094
 msgid "_Work Online"
 msgstr "_کار برخط"
 
-#: ../src/shell/e-shell-window-actions.c:1032
+#: ../src/shell/e-shell-window-actions.c:1096
 #, fuzzy
 #| msgid "Start in online mode"
 msgid "Put Evolution into online mode"
 msgstr "آغاز در حالت برخط"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Lay_out"
 msgstr "_چینش"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1132
 msgid "_New"
 msgstr "_جدید"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1139
 msgid "_Search"
 msgstr "_جست‌وجو"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1146
 msgid "_Switcher Appearance"
 msgstr "_ظاهر تعویض کننده"
 
-#: ../src/shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "_Window"
 msgstr "_پنجره"
 
-#: ../src/shell/e-shell-window-actions.c:1125
+#: ../src/shell/e-shell-window-actions.c:1189
 #, fuzzy
 #| msgid "Status _Bar"
 msgid "Show _Menu Bar"
 msgstr "_نوار وضعیت"
 
-#: ../src/shell/e-shell-window-actions.c:1127
+#: ../src/shell/e-shell-window-actions.c:1191
 #, fuzzy
 #| msgid "Show the \"Preview\" pane"
 msgid "Show the menu bar"
 msgstr "نشان دادن قاب «پیش‌نمایش»"
 
-#: ../src/shell/e-shell-window-actions.c:1133
+#: ../src/shell/e-shell-window-actions.c:1197
 #, fuzzy
 #| msgid "Side _Bar"
 msgid "Show Side _Bar"
 msgstr "_نوار کناری"
 
-#: ../src/shell/e-shell-window-actions.c:1135
+#: ../src/shell/e-shell-window-actions.c:1199
 #, fuzzy
 #| msgid "Show the \"Preview\" pane"
 msgid "Show the side bar"
 msgstr "نشان دادن قاب «پیش‌نمایش»"
 
-#: ../src/shell/e-shell-window-actions.c:1141
+#: ../src/shell/e-shell-window-actions.c:1205
 #, fuzzy
 #| msgid "Window B_uttons"
 msgid "Show _Buttons"
 msgstr "_دکمه‌های پنجره"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1207
 #, fuzzy
 #| msgid "Show time as _busy"
 msgid "Show the switcher buttons"
 msgstr "نشان دادن زمان به شکل _مشغول"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1213
 #, fuzzy
 #| msgid "Status _Bar"
 msgid "Show _Status Bar"
 msgstr "_نوار وضعیت"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1215
 #, fuzzy
 #| msgid "View/Hide the Status Bar"
 msgid "Show the status bar"
 msgstr "نمایش/مخفی کردن نوار وضعیت"
 
-#: ../src/shell/e-shell-window-actions.c:1157
+#: ../src/shell/e-shell-window-actions.c:1221
 #, fuzzy
 #| msgid "Show Full VCard"
 msgid "Show _Tool Bar"
 msgstr "نمایش کارت مجازی کامل"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1223
 #, fuzzy
 #| msgid "Show Attachment _Bar"
 msgid "Show the tool bar"
 msgstr "_نوار پیوست نمایش داده شود"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1245
 #, fuzzy
 #| msgid "_Icons only"
 msgid "_Icons Only"
 msgstr "فقط _شمایل‌ها"
 
-#: ../src/shell/e-shell-window-actions.c:1183
+#: ../src/shell/e-shell-window-actions.c:1247
 msgid "Display window buttons with icons only"
 msgstr "نمایش دکمه‌های پنجره فقط با شمایل"
 
-#: ../src/shell/e-shell-window-actions.c:1188
+#: ../src/shell/e-shell-window-actions.c:1252
 #, fuzzy
 #| msgid "_Text only"
 msgid "_Text Only"
 msgstr "_فقط متنی"
 
-#: ../src/shell/e-shell-window-actions.c:1190
+#: ../src/shell/e-shell-window-actions.c:1254
 msgid "Display window buttons with text only"
 msgstr "نمایش دکمه‌های پنجره فقط با متن"
 
-#: ../src/shell/e-shell-window-actions.c:1195
+#: ../src/shell/e-shell-window-actions.c:1259
 #, fuzzy
 #| msgid "Icons _and text"
 msgid "Icons _and Text"
 msgstr "شمایل _و متن"
 
-#: ../src/shell/e-shell-window-actions.c:1197
+#: ../src/shell/e-shell-window-actions.c:1261
 msgid "Display window buttons with icons and text"
 msgstr "نمایش دکمه‌های پنجره با شمایل و متن"
 
-#: ../src/shell/e-shell-window-actions.c:1202
+#: ../src/shell/e-shell-window-actions.c:1266
 #, fuzzy
 #| msgid "Tool_bar style"
 msgid "Tool_bar Style"
 msgstr "سبک _نوار ابزار"
 
-#: ../src/shell/e-shell-window-actions.c:1204
+#: ../src/shell/e-shell-window-actions.c:1268
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "نمایش دکمه‌های پنجره با استفاده از تنظیمات نوار ابزار رومیزی"
 
-#: ../src/shell/e-shell-window-actions.c:1212
+#: ../src/shell/e-shell-window-actions.c:1276
 #, fuzzy
 #| msgid "Save Current View"
 msgid "Delete Current View"
 msgstr "ذخیرهٔ نمای فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:1219
+#: ../src/shell/e-shell-window-actions.c:1283
 #, fuzzy
 #| msgid "Save Custom View"
 msgid "Save Custom View…"
 msgstr "ذخیرهٔ نمای سفارشی"
 
-#: ../src/shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1285
 #, fuzzy
 #| msgid "Save Current View"
 msgid "Save current custom view"
 msgstr "ذخیرهٔ نمای فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:1235
+#: ../src/shell/e-shell-window-actions.c:1299
 msgid "C_urrent View"
 msgstr "نمای _فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1309
 msgid "Custom View"
 msgstr "نمای سفارشی"
 
-#: ../src/shell/e-shell-window-actions.c:1247
+#: ../src/shell/e-shell-window-actions.c:1311
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../src/shell/e-shell-window-actions.c:1255
+#: ../src/shell/e-shell-window-actions.c:1319
 #, fuzzy
 #| msgid "Page Setup:"
 msgid "Page Set_up…"
 msgstr "تنظیمات صفحه:"
 
-#: ../src/shell/e-shell-window-actions.c:1257
+#: ../src/shell/e-shell-window-actions.c:1321
 #, fuzzy
 #| msgid "Set up the page settings for your current printer"
 msgid "Change the page settings for your current printer"
 msgstr "برپاسازی تنظیمات صفحه برای چاپگر فعلی"
 
-#: ../src/shell/e-shell-window-actions.c:1627
+#: ../src/shell/e-shell-window-actions.c:1696
 #, c-format
 msgid "Switch to %s"
 msgstr "تعویض به %s"
 
-#: ../src/shell/e-shell-window-actions.c:1751
+#: ../src/shell/e-shell-window-actions.c:1820
 #, fuzzy, c-format
 #| msgid "Select a file"
 msgid "Select view: %s"
 msgstr "یک پرونده انتخاب کنید"
 
-#: ../src/shell/e-shell-window-actions.c:1768
+#: ../src/shell/e-shell-window-actions.c:1837
 #, fuzzy, c-format
 #| msgid "Select a file"
 msgid "Delete view: %s"
 msgstr "یک پرونده انتخاب کنید"
 
-#: ../src/shell/e-shell-window-actions.c:1878
+#: ../src/shell/e-shell-window-actions.c:1952
 msgid "Execute these search parameters"
 msgstr ""
 
@@ -27622,7 +28366,7 @@ msgid "New"
 msgstr "جدید"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:786
+#: ../src/shell/e-shell-window-private.c:822
 #, fuzzy, c-format
 #| msgid "Evolution"
 msgid "%s — Evolution"
@@ -27713,13 +28457,13 @@ msgid ""
 "error: %s"
 msgstr ""
 
-#: ../src/shell/main.c:493 ../src/shell/main.c:498
+#: ../src/shell/main.c:497 ../src/shell/main.c:502
 #, fuzzy
 #| msgid "The Evolution PIM and Email Client"
 msgid "— The Evolution PIM and Email Client"
 msgstr "کارخواه PIM و رایانامهی اوولوشن"
 
-#: ../src/shell/main.c:554
+#: ../src/shell/main.c:558
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -27731,7 +28475,7 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
-#: ../src/shell/main.c:560
+#: ../src/shell/main.c:564
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: --online and --offline cannot be used together.\n"
@@ -27938,93 +28682,101 @@ msgstr ""
 "ویرایش تنظیمات اعتماد:"
 
 #: ../src/smime/gui/certificate-manager.c:82
-#: ../src/smime/gui/certificate-manager.c:101
-#: ../src/smime/gui/certificate-manager.c:121
+#: ../src/smime/gui/certificate-manager.c:102
+#: ../src/smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "نام گواهی"
 
 #: ../src/smime/gui/certificate-manager.c:83
-#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:104
 #, fuzzy
 #| msgid "Organization"
 msgid "Issued To Organization"
 msgstr "سازمان"
 
 #: ../src/smime/gui/certificate-manager.c:84
-#: ../src/smime/gui/certificate-manager.c:104
+#: ../src/smime/gui/certificate-manager.c:105
 #, fuzzy
 #| msgid "Organizational Unit (OU)"
 msgid "Issued To Organizational Unit"
 msgstr "واحد سازمانی (وس)‏"
 
 #: ../src/smime/gui/certificate-manager.c:85
-#: ../src/smime/gui/certificate-manager.c:105
-#: ../src/smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "شمارهٔ سریال"
 
 #: ../src/smime/gui/certificate-manager.c:86
-#: ../src/smime/gui/certificate-manager.c:106
-#: ../src/smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:107
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "مقاصد"
 
 #: ../src/smime/gui/certificate-manager.c:87
-#: ../src/smime/gui/certificate-manager.c:107
-#: ../src/smime/gui/certificate-manager.c:125
+#: ../src/smime/gui/certificate-manager.c:108
+#: ../src/smime/gui/certificate-manager.c:127
 #, fuzzy
 #| msgid "Issued On"
 msgid "Issued By"
 msgstr "صادر شده در تاریخ"
 
 #: ../src/smime/gui/certificate-manager.c:88
-#: ../src/smime/gui/certificate-manager.c:108
-#: ../src/smime/gui/certificate-manager.c:126
+#: ../src/smime/gui/certificate-manager.c:109
+#: ../src/smime/gui/certificate-manager.c:128
 #, fuzzy
 #| msgid "Organization"
 msgid "Issued By Organization"
 msgstr "سازمان"
 
 #: ../src/smime/gui/certificate-manager.c:89
-#: ../src/smime/gui/certificate-manager.c:109
-#: ../src/smime/gui/certificate-manager.c:127
+#: ../src/smime/gui/certificate-manager.c:110
+#: ../src/smime/gui/certificate-manager.c:129
 #, fuzzy
 #| msgid "Organizational Unit (OU)"
 msgid "Issued By Organizational Unit"
 msgstr "واحد سازمانی (وس)‏"
 
 #: ../src/smime/gui/certificate-manager.c:90
-#: ../src/smime/gui/certificate-manager.c:110
-#: ../src/smime/gui/certificate-manager.c:128
+#: ../src/smime/gui/certificate-manager.c:111
+#: ../src/smime/gui/certificate-manager.c:130
 #, fuzzy
 #| msgid "Issuer"
 msgid "Issued"
 msgstr "صادرکننده"
 
 #: ../src/smime/gui/certificate-manager.c:91
-#: ../src/smime/gui/certificate-manager.c:111
-#: ../src/smime/gui/certificate-manager.c:129
+#: ../src/smime/gui/certificate-manager.c:112
+#: ../src/smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "زمان انقضا"
 
 #: ../src/smime/gui/certificate-manager.c:92
-#: ../src/smime/gui/certificate-manager.c:112
-#: ../src/smime/gui/certificate-manager.c:130
-msgid "SHA1 Fingerprint"
+#: ../src/smime/gui/certificate-manager.c:113
+#: ../src/smime/gui/certificate-manager.c:132
+#, fuzzy
+#| msgid "SHA1 Fingerprint"
+msgid "SHA256 Fingerprint"
 msgstr "اثر انگشت SHA1"
 
 #: ../src/smime/gui/certificate-manager.c:93
-#: ../src/smime/gui/certificate-manager.c:113
-#: ../src/smime/gui/certificate-manager.c:131
+#: ../src/smime/gui/certificate-manager.c:114
+#: ../src/smime/gui/certificate-manager.c:133
+msgid "SHA1 Fingerprint"
+msgstr "اثر انگشت SHA1"
+
+#: ../src/smime/gui/certificate-manager.c:94
+#: ../src/smime/gui/certificate-manager.c:115
+#: ../src/smime/gui/certificate-manager.c:134
 msgid "MD5 Fingerprint"
 msgstr "اثر انگشت MD5"
 
-#: ../src/smime/gui/certificate-manager.c:102
-#: ../src/smime/gui/certificate-manager.c:122
+#: ../src/smime/gui/certificate-manager.c:103
+#: ../src/smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "نشانی رایانامه"
 
-#: ../src/smime/gui/certificate-manager.c:648
+#: ../src/smime/gui/certificate-manager.c:650
 msgid "Select a file to backup your key and certificate…"
 msgstr ""
 
@@ -28033,53 +28785,53 @@ msgstr ""
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:658
+#: ../src/smime/gui/certificate-manager.c:660
 #, c-format
 msgid "%s-backup.p12"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:721
+#: ../src/smime/gui/certificate-manager.c:719
 #, fuzzy
 #| msgid "Certificate"
 msgid "Backup Certificate"
 msgstr "گواهی"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:736
+#: ../src/smime/gui/certificate-manager.c:734
 #, fuzzy
 #| msgid "File name:"
 msgid "_File name:"
 msgstr "نام پرونده:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:739
 msgid "Please select a file…"
-msgstr "لطفاً پرونده‌ای برگزینید"
+msgstr "لطفاً پرونده‌ای برگزینید…"
 
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:753
 msgid "_Include certificate chain in the backup"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:761
+#: ../src/smime/gui/certificate-manager.c:759
 msgid ""
 "The certificate backup password you set here protects the backup file that you are "
 "about to create.\n"
 "You must set this password to proceed with the backup."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:778
 #, fuzzy
 #| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "کلمهٔ _عبور:"
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:797
 msgid "Passwords do not match"
 msgstr ""
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:807
+#: ../src/smime/gui/certificate-manager.c:805
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to restore "
@@ -28087,100 +28839,100 @@ msgid ""
 "Please record it in a safe location."
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:852
+#: ../src/smime/gui/certificate-manager.c:850
 msgid "No file name provided"
 msgstr "هیچ نام پرونده‌ای داده نشده"
 
-#: ../src/smime/gui/certificate-manager.c:856
+#: ../src/smime/gui/certificate-manager.c:854
 #, fuzzy
 #| msgid "Failed to authenticate.\n"
 msgid "Failed to backup key and certificate"
 msgstr "تأیید هویت شکست خورد.\n"
 
-#: ../src/smime/gui/certificate-manager.c:948
+#: ../src/smime/gui/certificate-manager.c:946
 #, fuzzy
 #| msgid "Select a certificate to import..."
 msgid "Select a certificate to import…"
 msgstr "یک گواهی برای وارد کردن انتخاب کنید..."
 
-#: ../src/smime/gui/certificate-manager.c:997
+#: ../src/smime/gui/certificate-manager.c:995
 #, fuzzy
 #| msgid "Failed to authenticate.\n"
 msgid "Failed to import certificate"
 msgstr "تأیید هویت شکست خورد.\n"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1112
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "پرسش هنگام استفاده"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "هرگز‌"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "حدوداً"
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "کاملاً"
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "شدیداً"
 
-#: ../src/smime/gui/certificate-manager.c:1124
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "موقّتاً"
 
-#: ../src/smime/gui/certificate-manager.c:1330
+#: ../src/smime/gui/certificate-manager.c:1328
 #, fuzzy
 #| msgid "Certificate Authority Trust"
 msgid "Change certificate trust"
 msgstr "اعتماد به مرجع صدور گواهی"
 
-#: ../src/smime/gui/certificate-manager.c:1342
+#: ../src/smime/gui/certificate-manager.c:1340
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr ""
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1364
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "_پرسش هنگام استفاده"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1365
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_هرگز به این گواهینامه اطمینان نشود"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "_موقّتاً مورد اطمینان (فقط این نشست)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_تقریباً مورد اطمینان"
 
-#: ../src/smime/gui/certificate-manager.c:1370
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_کاملاً مورد اطمینان"
 
-#: ../src/smime/gui/certificate-manager.c:1371
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_شدیداً مورد اطمینان"
 
-#: ../src/smime/gui/certificate-manager.c:1375
+#: ../src/smime/gui/certificate-manager.c:1373
 #, fuzzy
 #| msgid ""
 #| "Before trusting this CA for any purpose, you should examine its certificate and "
@@ -28192,55 +28944,55 @@ msgstr ""
 "پیش از اعتماد به این مرجع صدور گواهی به هر منظوری، باید گواهی، سیاست و رویه‌های آن "
 "(در صورت وجود) را  بررسی کنید."
 
-#: ../src/smime/gui/certificate-manager.c:1390
+#: ../src/smime/gui/certificate-manager.c:1388
 #, fuzzy
 #| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "_نمایش گواهی"
 
-#: ../src/smime/gui/certificate-manager.c:1595
+#: ../src/smime/gui/certificate-manager.c:1593
 #, fuzzy
 #| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "شما گواهی‌هایی در پرونده دارید که هویت این افراد را تأیید می‌کنند:"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1624
 msgid "Host name"
 msgstr "نام میزبان"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1626
 msgid "Issuer"
 msgstr "صادرکننده"
 
-#: ../src/smime/gui/certificate-manager.c:1629
+#: ../src/smime/gui/certificate-manager.c:1627
 #, fuzzy
 #| msgid "MD5 Fingerprint"
 msgid "Fingerprint"
 msgstr "اثر انگشت MD5"
 
-#: ../src/smime/gui/certificate-manager.c:1630
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Trust"
 msgstr "اطمینان"
 
-#: ../src/smime/gui/certificate-manager.c:1651
+#: ../src/smime/gui/certificate-manager.c:1649
 #, fuzzy
 #| msgid "_Edit CA Trust"
 msgid "_Edit Trust"
 msgstr "_ویرایش مراجع صدور مورد اعتماد"
 
-#: ../src/smime/gui/certificate-manager.c:2105
+#: ../src/smime/gui/certificate-manager.c:2085
 #, fuzzy
 #| msgid "PKCS12 File Password"
 msgid "All PKCS12 files"
 msgstr "'گذرواژهٔ پروندهٔ PKCS12"
 
-#: ../src/smime/gui/certificate-manager.c:2122
+#: ../src/smime/gui/certificate-manager.c:2102
 #, fuzzy
 #| msgid "Email Certificate Authority"
 msgid "All email certificate files"
 msgstr "مرجع صدور گواهی رایانامه"
 
-#: ../src/smime/gui/certificate-manager.c:2139
+#: ../src/smime/gui/certificate-manager.c:2119
 #, fuzzy
 #| msgid "Certificate details"
 msgid "All CA certificate files"
@@ -28380,11 +29132,11 @@ msgid "C_ertificate:"
 msgstr "_گواهینامه:"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:402
+#: ../src/smime/lib/e-cert.c:414
 msgid "Sign"
 msgstr "امضا"
 
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:415
 msgid "Encrypt"
 msgstr "رمزنگاری"
 
@@ -28433,6 +29185,41 @@ msgstr "باز کردن دفترچهٔ نشانی ممکن نیست، خطا:"
 msgid "Imported Certificate"
 msgstr "گواهی وارد شده"
 
+#~ msgid "Event cannot be fully edited, because you are not the organizer"
+#~ msgstr "رویداد نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
+
+#~ msgid "Task cannot be fully edited, because you are not the organizer"
+#~ msgstr "تکلیف نمی‌تواند به صورت کامل ویرایش شود، زیرا شما سازمان‌دهنده نیستید"
+
+#, fuzzy
+#~| msgid "Click to open %s"
+#~ msgid "Ctrl-click to open a link"
+#~ msgstr "برای باز کردن %s کلیک کنید"
+
+#~ msgid "_Plain Text"
+#~ msgstr "متن _خام"
+
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>رنگ‌ها</b>"
+
+#~ msgid "<b>Background Image</b>"
+#~ msgstr "<b>تصویر پس‌زمینه</b>"
+
+#~ msgid "_Destination"
+#~ msgstr "م_قصد"
+
+#~ msgid "Multiple Unseen Messages"
+#~ msgstr "چند پیام ندیده"
+
+#~ msgid "Multiple Messages"
+#~ msgstr "چند پیام"
+
+#~ msgid "Plugin Manager"
+#~ msgstr "مدیر متصل شونده‌ها"
+
+#~ msgid "Enable and disable plugins"
+#~ msgstr "به کار انداختن و از کار انداختن متصل شونده‌ها"
+
 #~ msgid ""
 #~ "Check to make sure your password is spelled correctly and that you are using a "
 #~ "supported login method. Remember that many passwords are case sensitive; your "
@@ -29185,11 +29972,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Close current tab"
 #~ msgstr "بستن پرونده‌ی فعلی"
 
-#, fuzzy
-#~| msgid "vFolders"
-#~ msgid "Folder '%s'"
-#~ msgstr "پوشه‌های مجازی"
-
 #, fuzzy
 #~| msgid "Failed to load the calendar '%s'"
 #~ msgid "Failed to load part '%s'"
@@ -29243,9 +30025,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Loading Images"
 #~ msgstr "_بار کردن تصاویر"
 
-#~ msgid "Security Information"
-#~ msgstr "اطلاعات امنیت"
-
 #~ msgid ""
 #~ "This will mark all messages as read in the selected folder and its subfolders."
 #~ msgstr ""
@@ -30065,11 +30844,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "_Download limit:"
 #~ msgstr "حدود بارگیری:"
 
-#, fuzzy
-#~| msgid "_Path:"
-#~ msgid "Path:"
-#~ msgstr "_مسیر:"
-
 #, fuzzy
 #~| msgid "Loading Calendar"
 #~ msgid "Loading calendars"
@@ -30085,11 +30859,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "_Basic Headers (fastest)"
 #~ msgstr "‌جدول سرنامه‌ها"
 
-#, fuzzy
-#~| msgid "Accept"
-#~ msgid "A_ccept"
-#~ msgstr "پذیرش"
-
 #~ msgid "Proxy _Logout"
 #~ msgstr "_خروج از پیشکار"
 
@@ -31502,9 +32271,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "There is no calendar available for creating events and meetings"
 #~ msgstr "تقویمی برای ایجاد رویداد و قرارها موجود نیست"
 
-#~ msgid "New appointment"
-#~ msgstr "قرار جدید"
-
 #~ msgid "New meeting"
 #~ msgstr "جلسه‌ی جدید"
 
@@ -31779,9 +32545,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "_Delete Selected Tasks"
 #~ msgstr "حذف تکلیف‌های انتخاب شده"
 
-#~ msgid "_Current View"
-#~ msgstr "_نمای فعلی"
-
 #~ msgid "Select T_oday"
 #~ msgstr "انتخاب ا_مروز"
 
@@ -31953,9 +32716,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Update"
 #~ msgstr "به‌هنگام سازی"
 
-#~ msgid "Tentatively accept"
-#~ msgstr "پذیرش احتمالی"
-
 #~ msgid "Decline"
 #~ msgstr "رد"
 
@@ -32387,9 +33147,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Completed on %B %d, %Y, %l:%M %p"
 #~ msgstr "کامل شده در %Od %B %Oy,‏ %OH:%OM"
 
-#~ msgid "Overdue:"
-#~ msgstr "عقب افتاده"
-
 #~ msgid "by %B %d, %Y, %l:%M %p"
 #~ msgstr "تا %Od %B %Oy, %OH:%OM"
 
@@ -32976,9 +33733,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Weather: Thunderstorms"
 #~ msgstr "آب و هوا: توفان تندری"
 
-#~ msgid "Select a location"
-#~ msgstr "یک مکان انتخاب کنید"
-
 #~ msgid "Metric (Celsius, cm, etc)"
 #~ msgstr "متری (سلیسیوس، سانتی‌متر، ...)"
 
@@ -33000,9 +33754,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "باز کردن پوشه‌ی کاربران دیگر"
 
-#~ msgid "_Folder Name:"
-#~ msgstr "_نام پوشه:"
-
 #~ msgid "Secure Password"
 #~ msgstr "گذرواژه‌ی امن"
 
@@ -33013,9 +33764,6 @@ msgstr "گواهی وارد شده"
 #~ "این گزینه با استفاده از تأیید هویت با گذرواژه‌ی امن (NTLM) به کارگزار Exchange "
 #~ "متصل خواهد شد."
 
-#~ msgid "Plaintext Password"
-#~ msgstr "گذرواژه‌ی متنی ساده"
-
 #~ msgid ""
 #~ "This option will connect to the Exchange server using standard plaintext "
 #~ "password authentication."
@@ -33774,9 +34522,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "Error executing %s."
 #~ msgstr "خطا هنگام اجرای %s."
 
-#~ msgid "Work Offline"
-#~ msgstr "کار برون‌خط"
-
 #~ msgid "Uknown system error."
 #~ msgstr "خطای سیستمی نامعلوم."
 
@@ -34377,9 +35122,6 @@ msgstr "گواهی وارد شده"
 #~ msgid "GDKFont"
 #~ msgstr "قلم GDK"
 
-#~ msgid "Justification"
-#~ msgstr "هم‌ترازی"
-
 #~ msgid "Use ellipsis"
 #~ msgstr "استفاده از سه نقطه"
 


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