From 1cfb17be17562c26189a7f8db552f39ec1c3bd7c Mon Sep 17 00:00:00 2001
From: Roozbeh Pournader <roozbeh@farsiweb.info>
Date: Wed, 6 Apr 2005 14:23:04 +0000
Subject: [PATCH] Updated Persian translation by Hessam M. Armandehi
 <hessam@cs.sharif.edu>.

2005-04-06  Roozbeh Pournader  <roozbeh@farsiweb.info>

	* fa.po: Updated Persian translation by
	  Hessam M. Armandehi <hessam@cs.sharif.edu>.
---
 po/ChangeLog |    5 +
 po/fa.po     | 2133 +++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 1287 insertions(+), 851 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index da8a157..d570e2a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-06  Roozbeh Pournader  <roozbeh@farsiweb.info>
+
+	* fa.po: Updated Persian translation by
+	  Hessam M. Armandehi <hessam@cs.sharif.edu>.
+
 2005-04-06  Danilo Å egan  <dsegan@gmx.net>
 
 	* sr.po, sr@Latn.po: Updated Serbian translations.
diff --git a/po/fa.po b/po/fa.po
index e2f0fbf..36afbc6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,30 +1,30 @@
-# Persian translation of evolution-data-server
-# Copyright (C) 2004 Sharif FarsiWeb, Inc.
-# This file is distributed under the same license as the evolution-data-server package.
-# Meelad Zakaria <meelad@bamdad.org>, 2004.
+# Persian translation of evolution-data-server.
+# Copyright (C) 2004, 2005 Sharif FarsiWeb, Inc.
+# Meelad Zakaria <meelad@farsiweb.info>, 2004.
+# Hessam M. Armandehi <hessam@cs.sharif.edu>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server 2.8\n"
+"Project-Id-Version: evolution-data-server HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-14 15:54+0800\n"
-"PO-Revision-Date: 2004-08-28 15:45+0330\n"
-"Last-Translator: Meelad Zakaria <meelad@bamdad.org>\n"
+"POT-Creation-Date: 2005-02-28 06:35+0100\n"
+"PO-Revision-Date: 2005-02-28 15:45+0330\n"
+"Last-Translator: Hessam M. Armandehi <hessam@cs.sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: addressbook/backends/file/e-book-backend-file.c:485
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2033
+#: addressbook/backends/file/e-book-backend-file.c:513
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2046
 #: addressbook/backends/vcf/e-book-backend-vcf.c:452
 msgid "Loading..."
 msgstr "در حال بار کردن..."
 
-#: addressbook/backends/file/e-book-backend-file.c:487
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2017
-#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2031
+#: addressbook/backends/file/e-book-backend-file.c:515
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2030
+#: addressbook/backends/groupwise/e-book-backend-groupwise.c:2044
 #: addressbook/backends/ldap/e-book-backend-ldap.c:3401
 #: addressbook/backends/vcf/e-book-backend-vcf.c:454
 msgid "Searching..."
@@ -32,11 +32,11 @@ msgstr "در حال جست و جو"
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:647
 msgid "Using Distinguished Name (DN)"
-msgstr ""
+msgstr "استفاده از نام مشخصه"
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:650
 msgid "Using Email Address"
-msgstr "با استفاده از نشانی پست الکترونیکی"
+msgstr "استفاده از نشانی پست الکترونیکی"
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:820
 msgid "Reconnecting to LDAP server..."
@@ -44,23 +44,23 @@ msgstr "در حال اتصال مجدد به کارگزار LDAP..."
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:1368
 msgid "Adding contact to LDAP server..."
-msgstr "در حال افزودن آشنا به کارگزار LDAP"
+msgstr "در حال اضافه کردن آشنا به کارگزار LDAP..."
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:1493
 msgid "Removing contact from LDAP server..."
-msgstr "در حال حذف آشنا از کارگزار LDAP"
+msgstr "در حال حذف آشنا از کارگزار LDAP..."
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:1750
 msgid "Modifying contact from LDAP server..."
-msgstr ""
+msgstr "در حال تغییر دادن آشنا از کارگزار LDAP..."
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:3290
 msgid "Receiving LDAP search results..."
-msgstr "در حال دریافت نتایج جست و جوی LDAP..."
+msgstr "در حال دریافت نتایج جستجوی LDAP..."
 
 #: addressbook/backends/ldap/e-book-backend-ldap.c:3421
 msgid "Error performing search"
-msgstr "خطا در اجرای جست و جو"
+msgstr "خطا در انجام جست و جو"
 
 #. translators: the placeholders will be filled by
 #. * function names, e.g.
@@ -80,7 +80,7 @@ msgstr "خطا در اجرای جست و جو"
 #: addressbook/libebook/e-book.c:3200
 #, c-format
 msgid "\"%s\" on book before \"%s\""
-msgstr ""
+msgstr "«%s» در دفترچه قبل از «%s»"
 
 #: addressbook/libebook/e-book.c:253 addressbook/libebook/e-book.c:459
 #: addressbook/libebook/e-book.c:592 addressbook/libebook/e-book.c:685
@@ -90,7 +90,7 @@ msgstr ""
 #: addressbook/libebook/e-book.c:2130 addressbook/libebook/e-book.c:2468
 #: addressbook/libebook/e-book.c:2664
 msgid "book busy"
-msgstr ""
+msgstr "دفترچه مشغول است"
 
 #: addressbook/libebook/e-book.c:286 addressbook/libebook/e-book.c:290
 #: addressbook/libebook/e-book.c:492 addressbook/libebook/e-book.c:496
@@ -108,60 +108,60 @@ msgstr ""
 #: addressbook/libebook/e-book.c:2696 addressbook/libebook/e-book.c:3209
 #, c-format
 msgid "CORBA exception making \"%s\" call"
-msgstr ""
+msgstr "استثنای CORBA «%s» را فرامی‌خواند"
 
 #: addressbook/libebook/e-book.c:2390
-msgid "e_book_cancel: there is no current operation"
-msgstr ""
+#, c-format
+msgid "%s: there is no current operation"
+msgstr "%s: عملیاتی در‌ جریان نیست"
 
 #: addressbook/libebook/e-book.c:2425
-msgid "e_book_cancel: couldn't cancel"
-msgstr ""
+#, c-format
+msgid "%s: couldn't cancel"
+msgstr "%s: انصراف ممکن نیست"
 
 #: addressbook/libebook/e-book.c:2454 addressbook/libebook/e-book.c:2458
 #, c-format
 msgid "\"%s\" on book after \"%s\""
-msgstr ""
+msgstr "«%s» در دفترچه بعد از «%s» "
 
 #: addressbook/libebook/e-book.c:2524
-msgid "e_book_open: cancelled"
-msgstr ""
+#, c-format
+msgid "%s: cancelled"
+msgstr "%s: صرف نظر شد"
 
 #: addressbook/libebook/e-book.c:3066
-msgid "e_book_load_uri: Invalid source."
-msgstr ""
-
-#: addressbook/libebook/e-book.c:3074
 #, c-format
-msgid "e_book_load_uri: no factories available for uri `%s'"
-msgstr ""
+msgid "%s: Invalid source."
+msgstr "%s: مبدأ نامعتبر."
 
-#: addressbook/libebook/e-book.c:3086
-msgid "e_book_load_uri: Could not create EBookListener"
+#: addressbook/libebook/e-book.c:3074 addressbook/libebook/e-book.c:3138
+#, fuzzy, c-format
+msgid "%s: no factories available for uri `%s'"
 msgstr ""
 
-#: addressbook/libebook/e-book.c:3138
+#: addressbook/libebook/e-book.c:3086
 #, c-format
-msgid "e_book_new: no factories available for uri `%s'"
-msgstr ""
+msgid "%s: Could not create EBookListener"
+msgstr "%s: ایجاد  EBookListener ممکن نیست"
 
 #: addressbook/libebook/e-book.c:3332
-msgid "e_book_get_self: there was no self contact uid stored in gconf"
-msgstr ""
+#, c-format
+msgid "%s: there was no self contact uid stored in gconf"
+msgstr "%s: شناسه‌ی کاربری اطلاعات تماس شخصی در gconf ذخیره نشده است"
 
 #: addressbook/libebook/e-book.c:3443
 #, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
-msgstr ""
+msgid "%s: there was no source for uid `%s' stored in gconf."
+msgstr "%s: مبدئی برای شناسه‌ی کاربری `%s' در gconf ذخیره نشده است. "
 
 #: addressbook/libebook/e-contact.c:102
 msgid "Unique ID"
-msgstr ""
+msgstr "شناسه‌ی یکتا"
 
 #: addressbook/libebook/e-contact.c:103
-msgid "File As"
-msgstr "پرونده به نام"
+msgid "File Under"
+msgstr "پرونده در دستِ"
 
 #. Name fields
 #. FN isn't really a structured field - we use a getter/setter
@@ -177,7 +177,7 @@ msgstr "نام"
 
 #: addressbook/libebook/e-contact.c:111
 msgid "Given Name"
-msgstr "نام کوچک"
+msgstr "اسم کوچک"
 
 #: addressbook/libebook/e-contact.c:112
 msgid "Family Name"
@@ -189,7 +189,7 @@ msgstr "لقب"
 
 #: addressbook/libebook/e-contact.c:114
 msgid "Name or Org"
-msgstr ""
+msgstr "نام یا سازمان"
 
 #. Address fields
 #: addressbook/libebook/e-contact.c:117
@@ -234,7 +234,7 @@ msgstr "تلفن کاری ۲"
 
 #: addressbook/libebook/e-contact.c:129
 msgid "Business Fax"
-msgstr "فکس کاری"
+msgstr "دورنگار کاری"
 
 #: addressbook/libebook/e-contact.c:130
 msgid "Callback Phone"
@@ -258,7 +258,7 @@ msgstr "تلفن خانه‌ی ۲"
 
 #: addressbook/libebook/e-contact.c:135
 msgid "Home Fax"
-msgstr "فکس خانه"
+msgstr "دورنگار خانه"
 
 #: addressbook/libebook/e-contact.c:136
 msgid "ISDN"
@@ -274,7 +274,7 @@ msgstr "تلفن دیگر"
 
 #: addressbook/libebook/e-contact.c:139
 msgid "Other Fax"
-msgstr "فکس دیگر"
+msgstr "دورنگار دیگر"
 
 #: addressbook/libebook/e-contact.c:140
 msgid "Pager"
@@ -294,7 +294,7 @@ msgstr "تلکس"
 
 #: addressbook/libebook/e-contact.c:144
 msgid "TTY"
-msgstr ""
+msgstr "TTY"
 
 #. Email fields
 #: addressbook/libebook/e-contact.c:147
@@ -340,7 +340,7 @@ msgstr "فهرست شناسه‌های Jabber"
 
 #: addressbook/libebook/e-contact.c:159
 msgid "Yahoo! Screen Name List"
-msgstr "فهرست نان‌های نمایشی Yahoo!"
+msgstr "فهرست نام‌های نمایشی Yahoo!"
 
 #: addressbook/libebook/e-contact.c:160
 msgid "MSN Screen Name List"
@@ -352,27 +352,27 @@ msgstr "فهرست شناسه‌های ICQ"
 
 #: addressbook/libebook/e-contact.c:163
 msgid "AIM Home Screen Name 1"
-msgstr "نام نمایشی AIM خانه ۱"
+msgstr "نام نمایشی AIM خانگی ۱"
 
 #: addressbook/libebook/e-contact.c:164
 msgid "AIM Home Screen Name 2"
-msgstr "نام نمایشی AIM خانه ۲"
+msgstr "نام نمایشی AIM خانگی ۲"
 
 #: addressbook/libebook/e-contact.c:165
 msgid "AIM Home Screen Name 3"
-msgstr "نام نمایشی AIM خانه ۳"
+msgstr "نام نمایشی AIM خانگی ۳"
 
 #: addressbook/libebook/e-contact.c:166
 msgid "AIM Work Screen Name 1"
-msgstr "نام نمایشی AIM محل کار ۱"
+msgstr "نام نمایشی AIM کاری ۱"
 
 #: addressbook/libebook/e-contact.c:167
 msgid "AIM Work Screen Name 2"
-msgstr "نام نمایشی AIM محل کار ۲"
+msgstr "نام نمایشی AIM کاری ۲"
 
 #: addressbook/libebook/e-contact.c:168
 msgid "AIM Work Screen Name 3"
-msgstr "نام نمایشی AIM محل کار ۳"
+msgstr "نام نمایشی AIM کاری ۳"
 
 #: addressbook/libebook/e-contact.c:169
 msgid "Groupwise Home Screen Name 1"
@@ -530,11 +530,11 @@ msgstr ""
 
 #: addressbook/libebook/e-contact.c:212
 msgid "Weblog URL"
-msgstr "URL وبلاگ"
+msgstr "نشانی اینترنتی وبلاگ"
 
 #: addressbook/libebook/e-contact.c:213
 msgid "Video Conferencing URL"
-msgstr "URL کنفرانس تصویری"
+msgstr "نشانی اینترنتی اجلاس تصویری"
 
 #. Photo/Logo
 #: addressbook/libebook/e-contact.c:216
@@ -543,7 +543,7 @@ msgstr "عکس"
 
 #: addressbook/libebook/e-contact.c:217
 msgid "Logo"
-msgstr "لوگو"
+msgstr "نشان"
 
 #. Security fields
 #: addressbook/libebook/e-contact.c:220
@@ -556,18 +556,18 @@ msgid "Category List"
 msgstr "فهرست مقولات"
 
 #: addressbook/libebook/e-contact.c:224
-#: libedataserverui/e-categories-dialog.c:369
+#: libedataserverui/e-categories-dialog.c:370
 msgid "Categories"
 msgstr "مقولات"
 
 #. Collaboration fields
 #: addressbook/libebook/e-contact.c:227
 msgid "Calendar URI"
-msgstr "URI تقویم"
+msgstr "نشانی اینترنتی تقویم"
 
 #: addressbook/libebook/e-contact.c:228
 msgid "Free/Busy URL"
-msgstr "URL آزاد/مشغول"
+msgstr "نشانی اینترنتی آزاد/مشغول"
 
 #: addressbook/libebook/e-contact.c:229
 msgid "ICS Calendar"
@@ -598,12 +598,18 @@ msgstr "فهرست"
 msgid "List Show Addresses"
 msgstr ""
 
-#: addressbook/libebook/e-contact.c:1208
+#: addressbook/libebook/e-contact.c:241
+msgid "Last Revision"
+msgstr "آخرین تجدید نظر"
+
+#: addressbook/libebook/e-contact.c:1210
+#: addressbook/libebook/e-destination.c:616
 msgid "Unnamed List"
-msgstr "فهرست بدون نام"
+msgstr "فهرست بی‌نام"
 
 #. Set category and visibility
 #: calendar/backends/contacts/e-cal-backend-contacts.c:446
+#: libedataserver/e-categories.c:226
 msgid "Birthday"
 msgstr "روز تولد"
 
@@ -617,49 +623,55 @@ msgstr "روز تولد: %s"
 msgid "Anniversary: %s"
 msgstr "سالگرد ازدواج: %s"
 
-#: calendar/backends/file/e-cal-backend-file.c:174
+#: calendar/backends/file/e-cal-backend-file.c:193
 msgid "Can't save calendar data: Malformed URI."
+msgstr "نمی‌توان داده‌های تقویم را ذخیره کرد: نشانی اینترنتی معیوب است."
+
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:754
+#: camel/providers/groupwise/camel-groupwise-folder.c:293
+msgid "Reply Requested: by "
+msgstr ""
+
+#: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:759
+#: camel/providers/groupwise/camel-groupwise-folder.c:298
+msgid "Reply Requested: When convenient"
 msgstr ""
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:484
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:526
 msgid "Invalid server URI"
-msgstr "URI کارگزار نامعتبر"
+msgstr "نشانی اینترنتی کارگزار نامعتبر"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:531
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:534
-#: camel/providers/groupwise/camel-gw-listener.c:405
-#: camel/providers/groupwise/camel-gw-listener.c:435
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:574
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:577
 msgid "Calendar"
 msgstr "تقویم"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:541
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:784
-#: calendar/backends/http/e-cal-backend-http.c:484
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:584
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:820
+#: calendar/backends/http/e-cal-backend-http.c:492
+#: calendar/backends/weather/e-cal-backend-weather.c:444
 msgid "Could not create cache file"
-msgstr "ایجاد پرونده‌ی حافظه‌ی نهان مقدور نیست"
+msgstr "ایجاد پرونده‌ی حافظه‌ی نهان ممکن نیست"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:551
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:594
 #, fuzzy
 msgid "Could not create thread for populating cache"
 msgstr "ایجاد پرونده‌ی حافظه‌ی نهان مقدور نیست"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:557
-#: calendar/libecal/e-cal.c:4560
-#: camel/providers/groupwise/camel-groupwise-folder.c:533
-#: camel/providers/groupwise/camel-groupwise-store.c:503
-#: camel/providers/groupwise/camel-groupwise-store.c:641
-#: camel/providers/groupwise/camel-groupwise-store.c:800
+#: calendar/backends/groupwise/e-cal-backend-groupwise.c:600
+#: calendar/libecal/e-cal.c:4516
+#: camel/providers/groupwise/camel-groupwise-folder.c:672
+#: camel/providers/groupwise/camel-groupwise-folder.c:690
+#: camel/providers/groupwise/camel-groupwise-store.c:526
+#: camel/providers/groupwise/camel-groupwise-store.c:628
+#: camel/providers/groupwise/camel-groupwise-store.c:787
+#: camel/providers/groupwise/camel-groupwise-store.c:985
 msgid "Authentication failed"
 msgstr "تأیید هویت شکست خورد"
 
-#: calendar/backends/groupwise/e-cal-backend-groupwise.c:776
-#, fuzzy
-msgid "Repository is Offline"
-msgstr "مخزن منفصل است"
-
 #: calendar/backends/http/e-cal-backend-http.c:240
 msgid "Redirected to Invalid URI"
-msgstr ""
+msgstr "هدایت به نشانی اینترنتی نامعتبر"
 
 #: calendar/backends/http/e-cal-backend-http.c:264
 msgid "Bad file format."
@@ -669,314 +681,506 @@ msgstr "قالب پرونده نامناسب است."
 msgid "Not a calendar."
 msgstr "تقویم نیست."
 
+#: calendar/backends/weather/e-cal-backend-weather.c:140
+msgid "Could not retrieve weather data"
+msgstr "بازیابی داده‌های وضع هوا ممکن نیست"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:194
+msgid "Fair"
+msgstr "مساعد"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:195
+msgid "Snow showers"
+msgstr "بارش شدید برف"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:196
+msgid "Snow"
+msgstr "برفی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:197
+msgid "Partly cloudy"
+msgstr "نیمه ابری"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:198
+msgid "Smoke"
+msgstr "دود آلود"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:199
+msgid "Thunderstorms"
+msgstr "توفان و تندر"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:200
+msgid "Cloudy"
+msgstr "ابری"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:201
+msgid "Drizzle"
+msgstr "نم‌نم باران"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:202
+msgid "Sunny"
+msgstr "آفتابی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:203
+msgid "Dust"
+msgstr "غبار آلود"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:204
+msgid "Clear"
+msgstr "صاف"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:205
+msgid "Mostly cloudy"
+msgstr "عمدتاً ابری"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:206
+msgid "Windy"
+msgstr "باد آلود"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:207
+msgid "Rain showers"
+msgstr "رگبار باران"
+#: calendar/backends/weather/e-cal-backend-weather.c:208
+msgid "Foggy"
+msgstr "مه آلود"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:209
+msgid "Rain/snow mixed"
+msgstr "مخلوط باران و برف "
+
+#: calendar/backends/weather/e-cal-backend-weather.c:210
+msgid "Sleet"
+msgstr "برف توأم با باران"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:211
+msgid "Very hot/humid"
+msgstr "خیلی گرم/شرجی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:212
+msgid "Blizzard"
+msgstr "بوران"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:213
+msgid "Freezing rain"
+msgstr "باران خیلی سرد"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:214
+msgid "Haze"
+msgstr "مه رقیق"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:215
+msgid "Blowing snow"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:216
+msgid "Freezing drizzle"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:217
+msgid "Very cold/wind chill"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:218
+msgid "Rain"
+msgstr "باران"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:228
+#: calendar/backends/weather/e-cal-backend-weather.c:236
+#: calendar/backends/weather/e-cal-backend-weather.c:238
+#: calendar/backends/weather/e-cal-backend-weather.c:245
+msgid "Weather: Sunny"
+msgstr "وضع هوا: آفتابی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:229
+#: calendar/backends/weather/e-cal-backend-weather.c:230
+#: calendar/backends/weather/e-cal-backend-weather.c:246
+#: calendar/backends/weather/e-cal-backend-weather.c:249
+msgid "Weather: Snow"
+msgstr "وضع هوا: برفی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:231
+msgid "Weather: Partly Cloudy"
+msgstr "وضع هوا: نیمه ابری"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:232
+#: calendar/backends/weather/e-cal-backend-weather.c:237
+#: calendar/backends/weather/e-cal-backend-weather.c:242
+#: calendar/backends/weather/e-cal-backend-weather.c:248
+msgid "Weather: Fog"
+msgstr "آب‌و‌هوا: مه آلود"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:233
+msgid "Weather: Thunderstorms"
+msgstr "آب‌و‌هوا: توفان و تندر"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:234
+#: calendar/backends/weather/e-cal-backend-weather.c:239
+msgid "Weather: Cloudy"
+msgstr "وضع هوا: ابری"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:235
+#: calendar/backends/weather/e-cal-backend-weather.c:241
+#: calendar/backends/weather/e-cal-backend-weather.c:243
+#: calendar/backends/weather/e-cal-backend-weather.c:244
+#: calendar/backends/weather/e-cal-backend-weather.c:247
+#: calendar/backends/weather/e-cal-backend-weather.c:250
+#: calendar/backends/weather/e-cal-backend-weather.c:252
+msgid "Weather: Rain"
+msgstr "وضع هوا: بارانی"
+
+#: calendar/backends/weather/e-cal-backend-weather.c:327
+#, c-format
+msgid "%.1f°C - %s"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:329
+#, c-format
+msgid "%.1f°F - %s"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:332
+#, c-format
+msgid "%.1f/%.1f°C - %s"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:334
+#, c-format
+msgid "%.1f/%.1f°F - %s"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:340
+#, c-format
+msgid "%d%% chance of precipitation\n"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:347
+#, c-format
+msgid "%.1fcm snow\n"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:349
+#, c-format
+msgid "%.1fin snow\n"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:352
+#, c-format
+msgid "%.1f-%.1fcm snow\n"
+msgstr ""
+
+#: calendar/backends/weather/e-cal-backend-weather.c:354
+#, c-format
+msgid "%.1f-%.1fin snow\n"
+msgstr ""
+
 #: calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
-msgstr "قرار بدون عنوان"
+msgstr "قرار بی‌عنوان"
 
 #: calendar/libecal/e-cal-recur.c:3996
 msgid "1st"
-msgstr "م۱"
+msgstr "یکم"
 
 #: calendar/libecal/e-cal-recur.c:3997
 msgid "2nd"
-msgstr "۲م"
+msgstr "دوم"
 
 #: calendar/libecal/e-cal-recur.c:3998
 msgid "3rd"
-msgstr "۳م"
+msgstr "سوم"
 
 #: calendar/libecal/e-cal-recur.c:3999
 msgid "4th"
-msgstr "۴م"
+msgstr "چهارم"
 
 #: calendar/libecal/e-cal-recur.c:4000
 msgid "5th"
-msgstr "۵م"
+msgstr "پنجم"
 
 #: calendar/libecal/e-cal-recur.c:4001
 msgid "6th"
-msgstr "۶م"
+msgstr "ششم"
 
 #: calendar/libecal/e-cal-recur.c:4002
 msgid "7th"
-msgstr "۷م"
+msgstr "هفتم"
 
 #: calendar/libecal/e-cal-recur.c:4003
 msgid "8th"
-msgstr "۸م"
+msgstr "هشتم"
 
 #: calendar/libecal/e-cal-recur.c:4004
 msgid "9th"
-msgstr "۹م"
+msgstr "نهم"
 
 #: calendar/libecal/e-cal-recur.c:4005
 msgid "10th"
-msgstr "۱۰م"
+msgstr "دهم"
 
 #: calendar/libecal/e-cal-recur.c:4006
 msgid "11th"
-msgstr "۱۱م"
+msgstr "یازدهم"
 
 #: calendar/libecal/e-cal-recur.c:4007
 msgid "12th"
-msgstr "۱۲م"
+msgstr "دوازدهم"
 
 #: calendar/libecal/e-cal-recur.c:4008
 msgid "13th"
-msgstr "۱۳م"
+msgstr "سیزدهم"
 
 #: calendar/libecal/e-cal-recur.c:4009
 msgid "14th"
-msgstr "۱۴م"
+msgstr "چهاردهم"
 
 #: calendar/libecal/e-cal-recur.c:4010
 msgid "15th"
-msgstr "۱۵م"
+msgstr "پانزدهم"
 
 #: calendar/libecal/e-cal-recur.c:4011
 msgid "16th"
-msgstr "۱۶م"
+msgstr "شانزدهم"
 
 #: calendar/libecal/e-cal-recur.c:4012
 msgid "17th"
-msgstr "۱۷م"
+msgstr "هفدهم"
 
 #: calendar/libecal/e-cal-recur.c:4013
 msgid "18th"
-msgstr "۱۸م"
+msgstr "هجدهم"
 
 #: calendar/libecal/e-cal-recur.c:4014
 msgid "19th"
-msgstr "۱۹م"
+msgstr "نوزدهم"
 
 #: calendar/libecal/e-cal-recur.c:4015
 msgid "20th"
-msgstr "۲۰م"
+msgstr "بیستم"
 
 #: calendar/libecal/e-cal-recur.c:4016
 msgid "21st"
-msgstr "۲۱م"
+msgstr "بیست و یکم"
 
 #: calendar/libecal/e-cal-recur.c:4017
 msgid "22nd"
-msgstr "۲۲م"
+msgstr "بیست و دوم"
 
 #: calendar/libecal/e-cal-recur.c:4018
 msgid "23rd"
-msgstr "۲۳م"
+msgstr "بیست و سوم"
 
 #: calendar/libecal/e-cal-recur.c:4019
 msgid "24th"
-msgstr "۲۴م"
+msgstr "بیست و چهارم"
 
 #: calendar/libecal/e-cal-recur.c:4020
 msgid "25th"
-msgstr "۲۵م"
+msgstr "بیست و پنجم"
 
 #: calendar/libecal/e-cal-recur.c:4021
 msgid "26th"
-msgstr "۲۶م"
+msgstr "بیست و ششم"
 
 #: calendar/libecal/e-cal-recur.c:4022
 msgid "27th"
-msgstr "۲۷م"
+msgstr "بیست و هفتم"
 
 #: calendar/libecal/e-cal-recur.c:4023
 msgid "28th"
-msgstr "۲۸م"
+msgstr "بیست و هشتم"
 
 #: calendar/libecal/e-cal-recur.c:4024
 msgid "29th"
-msgstr "۲۹م"
+msgstr "بیست و نهم"
 
 #: calendar/libecal/e-cal-recur.c:4025
 msgid "30th"
-msgstr "۳۰م"
+msgstr "سی‌ام"
 
 #: calendar/libecal/e-cal-recur.c:4026
 msgid "31st"
-msgstr "۳۱م"
+msgstr "سی و یکم"
 
-#: calendar/libecal/e-cal-util.c:569 calendar/libecal/e-cal-util.c:591
+#: calendar/libecal/e-cal-util.c:568 calendar/libecal/e-cal-util.c:590
 msgid "High"
 msgstr "بالا"
 
-#: calendar/libecal/e-cal-util.c:571 calendar/libecal/e-cal-util.c:593
+#: calendar/libecal/e-cal-util.c:570 calendar/libecal/e-cal-util.c:592
 msgid "Normal"
 msgstr "عادی"
 
-#: calendar/libecal/e-cal-util.c:573 calendar/libecal/e-cal-util.c:595
+#: calendar/libecal/e-cal-util.c:572 calendar/libecal/e-cal-util.c:594
 msgid "Low"
 msgstr "پایین"
 
 #. An empty string is the same as 'None'.
-#: calendar/libecal/e-cal-util.c:589
+#: calendar/libecal/e-cal-util.c:588
 msgid "Undefined"
 msgstr "نامعین"
 
 #. actually ask the client for authentication
-#: calendar/libecal/e-cal.c:1590
+#: calendar/libecal/e-cal.c:1534
 #, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "کلمه‌ی عبور %s را وارد کنید )کاربر %s)"
+msgstr ""
+"کلمه‌ی عبور %s (کاربر %s) را وارد کنید"
 
-#: calendar/libecal/e-cal.c:4532
+#: calendar/libecal/e-cal.c:4488
 msgid "Invalid argument"
 msgstr "آرگومان نامعتبر"
 
-#: calendar/libecal/e-cal.c:4534
+#: calendar/libecal/e-cal.c:4490
 msgid "Backend is busy"
-msgstr ""
+msgstr "پسانه مشغول است"
 
-#: calendar/libecal/e-cal.c:4536
+#: calendar/libecal/e-cal.c:4492
 msgid "Repository is offline"
 msgstr "مخزن منفصل است"
 
-#: calendar/libecal/e-cal.c:4538
+#: calendar/libecal/e-cal.c:4494
 msgid "No such calendar"
 msgstr "چنین تقویمی وجود ندارد"
 
-#: calendar/libecal/e-cal.c:4540 servers/groupwise/e-gw-connection.c:158
+#: calendar/libecal/e-cal.c:4496 servers/groupwise/e-gw-connection.c:165
 msgid "Object not found"
-msgstr ""
+msgstr "شیء پیدا نشد"
 
-#: calendar/libecal/e-cal.c:4542 servers/groupwise/e-gw-connection.c:154
+#: calendar/libecal/e-cal.c:4498 servers/groupwise/e-gw-connection.c:159
 msgid "Invalid object"
-msgstr ""
+msgstr "شیء نامعتبر"
 
-#: calendar/libecal/e-cal.c:4544
+#: calendar/libecal/e-cal.c:4500
 msgid "URI not loaded"
-msgstr "URI بار نشد"
+msgstr "نشانی اینترنتی بار نشد"
 
-#: calendar/libecal/e-cal.c:4546
+#: calendar/libecal/e-cal.c:4502
 msgid "URI already loaded"
-msgstr "URI قبلاْ بار شده است"
+msgstr "نشانی اینترنتی قبلاْ بار شده است"
 
-#: calendar/libecal/e-cal.c:4548
+#: calendar/libecal/e-cal.c:4504
 msgid "Permission denied"
 msgstr "اجازه داده نشد"
 
-#: calendar/libecal/e-cal.c:4550 servers/groupwise/e-gw-connection.c:160
-#, fuzzy
+#: calendar/libecal/e-cal.c:4506 servers/groupwise/e-gw-connection.c:167
 msgid "Unknown User"
-msgstr "خطای ناشناخته"
+msgstr "کاربر نامعلوم"
 
-#: calendar/libecal/e-cal.c:4552
+#: calendar/libecal/e-cal.c:4508
 msgid "Object ID already exists"
 msgstr ""
 
-#: calendar/libecal/e-cal.c:4554
+#: calendar/libecal/e-cal.c:4510
 msgid "Protocol not supported"
 msgstr "پروتکل پشتیبانی نمی‌شود"
 
-#: calendar/libecal/e-cal.c:4556
+#: calendar/libecal/e-cal.c:4512
 msgid "Operation has been cancelled"
-msgstr "عملیات لغو شده است"
+msgstr "از عملیات صرف نظر شده است"
 
-#: calendar/libecal/e-cal.c:4558
+#: calendar/libecal/e-cal.c:4514
 msgid "Could not cancel operation"
-msgstr "الغای عملیات مقدور نیست"
+msgstr "انصراف از عملیات ممکن نیست"
 
-#: calendar/libecal/e-cal.c:4562
+#: calendar/libecal/e-cal.c:4518
 #: camel/providers/smtp/camel-smtp-transport.c:215
 msgid "Authentication required"
 msgstr "تأیید هویت لازم است"
 
-#: calendar/libecal/e-cal.c:4564
+#: calendar/libecal/e-cal.c:4520
 msgid "A CORBA exception has occurred"
-msgstr ""
+msgstr "یک استثنای CORBA رخ داده است"
 
-#: calendar/libecal/e-cal.c:4566 camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-command.c:401
-#: camel/providers/imap4/camel-imap4-store.c:294
+#: calendar/libecal/e-cal.c:4522 camel/providers/imap/camel-imap-command.c:304
+#: camel/providers/imap/camel-imap-command.c:404
+#: camel/providers/imap4/camel-imap4-store.c:376
 #: camel/providers/pop3/camel-pop3-store.c:535
 #: camel/providers/pop3/camel-pop3-store.c:542
 #: camel/providers/pop3/camel-pop3-store.c:548
-#: servers/groupwise/e-gw-connection.c:166
+#: servers/groupwise/e-gw-connection.c:173
 msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
-#: calendar/libecal/e-cal.c:4568
+#: calendar/libecal/e-cal.c:4524
 msgid "No error"
 msgstr "بدون خطا"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:50
-#: calendar/libedata-cal/e-cal-backend-sexp.c:529
-#: calendar/libedata-cal/e-cal-backend-sexp.c:722
-#: calendar/libedata-cal/e-cal-backend-sexp.c:749
+#: calendar/libedata-cal/e-cal-backend-sexp.c:54
+#: calendar/libedata-cal/e-cal-backend-sexp.c:533
+#: calendar/libedata-cal/e-cal-backend-sexp.c:726
+#: calendar/libedata-cal/e-cal-backend-sexp.c:753
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:75
-#: calendar/libedata-cal/e-cal-backend-sexp.c:169
-#: calendar/libedata-cal/e-cal-backend-sexp.c:203
-#: calendar/libedata-cal/e-cal-backend-sexp.c:239
-#: calendar/libedata-cal/e-cal-backend-sexp.c:787
+#: calendar/libedata-cal/e-cal-backend-sexp.c:79
+#: calendar/libedata-cal/e-cal-backend-sexp.c:173
+#: calendar/libedata-cal/e-cal-backend-sexp.c:207
+#: calendar/libedata-cal/e-cal-backend-sexp.c:243
+#: calendar/libedata-cal/e-cal-backend-sexp.c:791
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:81
-#: calendar/libedata-cal/e-cal-backend-sexp.c:88
-#: calendar/libedata-cal/e-cal-backend-sexp.c:245
-#: calendar/libedata-cal/e-cal-backend-sexp.c:473
+#: calendar/libedata-cal/e-cal-backend-sexp.c:85
+#: calendar/libedata-cal/e-cal-backend-sexp.c:92
+#: calendar/libedata-cal/e-cal-backend-sexp.c:249
+#: calendar/libedata-cal/e-cal-backend-sexp.c:477
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:96
+#: calendar/libedata-cal/e-cal-backend-sexp.c:100
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:127
-#: calendar/libedata-cal/e-cal-backend-sexp.c:312
-#: calendar/libedata-cal/e-cal-backend-sexp.c:467
-#: calendar/libedata-cal/e-cal-backend-sexp.c:561
+#: calendar/libedata-cal/e-cal-backend-sexp.c:131
+#: calendar/libedata-cal/e-cal-backend-sexp.c:316
+#: calendar/libedata-cal/e-cal-backend-sexp.c:471
+#: calendar/libedata-cal/e-cal-backend-sexp.c:565
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:133
-#: calendar/libedata-cal/e-cal-backend-sexp.c:175
-#: calendar/libedata-cal/e-cal-backend-sexp.c:209
-#: calendar/libedata-cal/e-cal-backend-sexp.c:318
-#: calendar/libedata-cal/e-cal-backend-sexp.c:567
-#: calendar/libedata-cal/e-cal-backend-sexp.c:793
+#: calendar/libedata-cal/e-cal-backend-sexp.c:137
+#: calendar/libedata-cal/e-cal-backend-sexp.c:179
+#: calendar/libedata-cal/e-cal-backend-sexp.c:213
+#: calendar/libedata-cal/e-cal-backend-sexp.c:322
+#: calendar/libedata-cal/e-cal-backend-sexp.c:571
+#: calendar/libedata-cal/e-cal-backend-sexp.c:797
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:141
+#: calendar/libedata-cal/e-cal-backend-sexp.c:145
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:326
-#: calendar/libedata-cal/e-cal-backend-sexp.c:575
+#: calendar/libedata-cal/e-cal-backend-sexp.c:330
+#: calendar/libedata-cal/e-cal-backend-sexp.c:579
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:481
+#: calendar/libedata-cal/e-cal-backend-sexp.c:485
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:501
+#: calendar/libedata-cal/e-cal-backend-sexp.c:505
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
 "\"description\", or \"location\""
 msgstr ""
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:624
+#: calendar/libedata-cal/e-cal-backend-sexp.c:628
 #, c-format
 msgid "\"%s\" expects at least one argument"
-msgstr ""
+msgstr "«%s» حداقل یک آرگومان لازم است"
 
-#: calendar/libedata-cal/e-cal-backend-sexp.c:638
+#: calendar/libedata-cal/e-cal-backend-sexp.c:642
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1013,7 +1217,7 @@ msgstr ""
 
 #: camel/camel-cipher-context.c:255
 msgid "Decrypting message"
-msgstr ""
+msgstr "در حال رمزگشایی پیغام"
 
 #: camel/camel-cipher-context.c:272
 msgid "You may not import keys with this cipher"
@@ -1039,7 +1243,9 @@ msgid ""
 "Further operations on this server will not be replayed when you\n"
 "reconnect to the network."
 msgstr ""
-
+"نوشتن مدخل ثبت وقایع امکان پذیر نبود: %s"
+"\n"
+"عملیات بیشتر بر روی این کارگزار پس از برقراری ارتباط مجدد با شبکه\n از سرگیری نخواهد شد."
 #: camel/camel-disco-diary.c:258
 #, c-format
 msgid ""
@@ -1047,117 +1253,119 @@ msgid ""
 "%s\n"
 "Changes made to this folder will not be resynchronized."
 msgstr ""
-
+"باز کردن «%s» امکان پذیر نبود:"
+"\n"
+"%s\n"
+"تغییرات اعمال شده بر روی این پوشه مجدداً همگام‌سازی نخواهد شد."
 #: camel/camel-disco-diary.c:294
 msgid "Resynchronizing with server"
-msgstr ""
+msgstr "همگام‌سازی مجدد با کارگزار"
 
-#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:50
+#: camel/camel-disco-folder.c:42 camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
-msgstr ""
+msgstr "نسخه‌برداری محلی از محتویات پوشه برای عملیات در حالت منفصل"
 
-#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:107
+#: camel/camel-disco-folder.c:104 camel/camel-offline-folder.c:110
 msgid "Downloading new messages for offline mode"
-msgstr ""
+msgstr "بارگیری پیغام‌های جدید برای حالت منفصل"
 
 #: camel/camel-disco-folder.c:467
 #, c-format
 msgid "Preparing folder '%s' for offline"
-msgstr ""
+msgstr "آماده‌سازی پوشه‌ی «%s» برای حالت منفصل"
 
 #: camel/camel-disco-store.c:405
 msgid "You must be working online to complete this operation"
-msgstr ""
+msgstr "برای تکمیل این عملیات باید متصل کار کنید"
 
-#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:512
-#: camel/camel-process.c:48
+#: camel/camel-filter-driver.c:689 camel/camel-filter-search.c:523
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
-msgstr ""
+msgstr "ایجاد لوله به «%s» شکست خورد: %s"
 
-#: camel/camel-filter-driver.c:713 camel/camel-process.c:90
+#: camel/camel-filter-driver.c:733
 #, c-format
 msgid "Failed to create child process '%s': %s"
-msgstr ""
+msgstr "ساختن فراروند فرزند «%s» شکست خورد: %s"
 
-#: camel/camel-filter-driver.c:756
+#: camel/camel-filter-driver.c:776
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr ""
+msgstr "جریان پیغام نامعتبر از %s دریافت شد: %s"
 
-#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
+#: camel/camel-filter-driver.c:965 camel/camel-filter-driver.c:974
 msgid "Syncing folders"
-msgstr ""
+msgstr "همگام سازی پوشه‌ها"
 
-#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
+#: camel/camel-filter-driver.c:1063 camel/camel-filter-driver.c:1440
 #, c-format
 msgid "Error parsing filter: %s: %s"
-msgstr ""
+msgstr "خطا در تجزیه‌ی صافی: %s: %s"
 
-#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1429
+#: camel/camel-filter-driver.c:1072 camel/camel-filter-driver.c:1449
 #, c-format
 msgid "Error executing filter: %s: %s"
-msgstr ""
+msgstr "خطا در اجرای صافی: %s: %s"
 
-#: camel/camel-filter-driver.c:1119
+#: camel/camel-filter-driver.c:1139
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1128
+#: camel/camel-filter-driver.c:1148
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1143
+#: camel/camel-filter-driver.c:1163
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1147
+#: camel/camel-filter-driver.c:1167
 msgid "Cannot open message"
-msgstr "باز کردن پیغام ممکن نیست"
+msgstr "پیغام باز نمی‌شود"
 
-#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
+#: camel/camel-filter-driver.c:1168 camel/camel-filter-driver.c:1180
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
+#: camel/camel-filter-driver.c:1194 camel/camel-filter-driver.c:1285
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1178 camel/camel-filter-driver.c:1270
+#: camel/camel-filter-driver.c:1198 camel/camel-filter-driver.c:1290
 msgid "Complete"
 msgstr "انجام شده"
 
-#: camel/camel-filter-driver.c:1235
+#: camel/camel-filter-driver.c:1255
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "در حال دریافت پیغام %Id از %Id"
 
-#: camel/camel-filter-driver.c:1250
+#: camel/camel-filter-driver.c:1270
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "شکست در پیغام %Id از %Id"
 
-#: camel/camel-filter-search.c:135
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "بازیابی پیغام شکست خورد"
 
-#: camel/camel-filter-search.c:385
+#: camel/camel-filter-search.c:396
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:400
+#: camel/camel-filter-search.c:411
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:548
+#: camel/camel-filter-search.c:559
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr ""
 
 #. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:682 camel/camel-filter-search.c:690
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
@@ -1218,7 +1426,7 @@ msgstr ""
 
 #: camel/camel-folder.c:1352
 msgid "Moving messages"
-msgstr "در حال انتقال پیغام‌ها"
+msgstr "در جابه‌جایی پیغام‌ها"
 
 #: camel/camel-folder.c:1352
 msgid "Copying messages"
@@ -1236,7 +1444,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "در حال از صافی رد کردن پیغام‌(های) جدید"
 
-#: camel/camel-gpg-context.c:735
+#: camel/camel-gpg-context.c:734
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1244,119 +1452,106 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:749
+#: camel/camel-gpg-context.c:748
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:773
+#: camel/camel-gpg-context.c:772
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:786
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
-#: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1274
+#: camel/camel-gpg-context.c:803 camel/camel-gpg-context.c:1000
+#: camel/providers/nntp/camel-nntp-store.c:1274
 msgid "Cancelled."
-msgstr "لغو شد."
+msgstr "صرف نظر شد."
 
-#: camel/camel-gpg-context.c:822
+#: camel/camel-gpg-context.c:821
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:828
+#: camel/camel-gpg-context.c:827
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:880
+#: camel/camel-gpg-context.c:879
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1157
+#. always called on an i/o error
+#: camel/camel-gpg-context.c:1138 camel/camel-gpg-context.c:1262
+#: camel/camel-gpg-context.c:1687 camel/camel-gpg-context.c:1732
 #, c-format
-msgid ""
-"Failed to GPG %s: %s\n"
-"\n"
-"%s"
-msgstr ""
-
-#: camel/camel-gpg-context.c:1162
-#, c-format
-msgid "Failed to GPG %s: %s\n"
-msgstr ""
+msgid "Failed to execute gpg: %s"
+msgstr "اجرای gpg شکست خورد: %s"
 
-#: camel/camel-gpg-context.c:1275 camel/camel-smime-context.c:389
+#: camel/camel-gpg-context.c:1230 camel/camel-smime-context.c:389
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1307 camel/camel-gpg-context.c:1766
-#: camel/camel-gpg-context.c:1817
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "اجرای gpg شکست خورد: %s"
-
-#: camel/camel-gpg-context.c:1331 camel/camel-gpg-context.c:1491
-#: camel/camel-gpg-context.c:1582 camel/camel-gpg-context.c:1605
-#: camel/camel-gpg-context.c:1694 camel/camel-gpg-context.c:1718
-#: camel/camel-gpg-context.c:1788 camel/camel-gpg-context.c:1839
+#: camel/camel-gpg-context.c:1277 camel/camel-gpg-context.c:1437
+#: camel/camel-gpg-context.c:1519 camel/camel-gpg-context.c:1534
+#: camel/camel-gpg-context.c:1623 camel/camel-gpg-context.c:1638
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1748
 msgid "Failed to execute gpg."
 msgstr "اجرای gp شکست خورد."
 
-#: camel/camel-gpg-context.c:1350
+#: camel/camel-gpg-context.c:1296
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1431 camel/camel-gpg-context.c:1437
-#: camel/camel-gpg-context.c:1443 camel/camel-smime-context.c:692
+#: camel/camel-gpg-context.c:1377 camel/camel-gpg-context.c:1383
+#: camel/camel-gpg-context.c:1389 camel/camel-smime-context.c:692
 #: camel/camel-smime-context.c:703 camel/camel-smime-context.c:710
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1477
+#: camel/camel-gpg-context.c:1423
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1502
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "تولید داده‌های رمزنگاری شده ممکن نیست: %s"
 
-#: camel/camel-gpg-context.c:1623
+#: camel/camel-gpg-context.c:1552
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1674
+#: camel/camel-gpg-context.c:1603
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1725 camel/camel-smime-context.c:966
+#: camel/camel-gpg-context.c:1645 camel/camel-smime-context.c:966
 msgid "Encrypted content"
 msgstr "محتویات رمزنگاری شده"
 
-#: camel/camel-gpg-context.c:1744
+#: camel/camel-gpg-context.c:1664
 msgid "Unable to parse message content"
 msgstr "تجزیه‌ی محتویات پیغام ممکن نیست"
 
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-gpg-context.c:1688 camel/camel-gpg-context.c:1733
 #: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-engine.c:1550
+#: camel/providers/imap4/camel-imap4-engine.c:1589
+#: camel/providers/imap4/camel-imap4-engine.c:1634
+#: camel/providers/imap4/camel-imap4-engine.c:1690
+#: camel/providers/imap4/camel-imap4-store.c:1434
 #: camel/providers/imap4/camel-imap4-utils.c:575
 #: camel/providers/smtp/camel-smtp-transport.c:163
 #: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Unknown"
-msgstr "ناشناخته"
+msgstr "نامعلوم"
 
 #: camel/camel-lock-client.c:100
 #, c-format
@@ -1381,7 +1576,7 @@ msgstr "قفل کردن '%s' ممکن نیست"
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
-msgstr "ایجاد پرونده‌ی قفل شده برای %s ممکن نیست: %s"
+msgstr "ایجاد پرونده‌ی قفل برای %s ممکن نیست: %s"
 
 #: camel/camel-lock.c:154
 #, c-format
@@ -1411,7 +1606,7 @@ msgstr "باز کردن پرونده‌ی نامه‌ی %s ممکن نیست: %s
 #: camel/camel-movemail.c:125
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
-msgstr "باز کردن پرونده‌ی نامه‌ی موقت %s: %s"
+msgstr "باز کردن پرونده‌ی موقت نامه‌ی %s ممکن نیست: %s"
 
 #: camel/camel-movemail.c:154
 #, c-format
@@ -1421,7 +1616,7 @@ msgstr ""
 #: camel/camel-movemail.c:184
 #, c-format
 msgid "Could not create pipe: %s"
-msgstr "ایجاد لوله مفدور نیست: %s"
+msgstr "ایجاد لوله ممکن نیست: %s"
 
 #: camel/camel-movemail.c:196
 #, c-format
@@ -1452,7 +1647,7 @@ msgstr "خطا در نوشتن پرونده‌ی موقت نامه: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "خطا در نسخه‌برداری از پرونده‌ی موقت نامه: %s"
 
-#: camel/camel-multipart-signed.c:586
+#: camel/camel-multipart-signed.c:587
 msgid "parse error"
 msgstr "خطا در تجزیه"
 
@@ -1460,7 +1655,7 @@ msgstr "خطا در تجزیه"
 #: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:448
 #: camel/providers/pop3/camel-pop3-store.c:529
 msgid "Cancelled"
-msgstr "لغو شد"
+msgstr "صرف نظر شد"
 
 #: camel/camel-net-utils.c:465
 msgid "cannot create thread"
@@ -1489,19 +1684,19 @@ msgid "Name lookup failed"
 msgstr ""
 
 #: camel/camel-net-utils.c:766
-#, fuzzy, c-format
+#, c-format
 msgid "Name lookup failed: %s"
-msgstr "عملیات شکست خورد: %s"
+msgstr ""
 
-#: camel/camel-offline-folder.c:250
-#, fuzzy, c-format
+#: camel/camel-offline-folder.c:253
+#, c-format
 msgid "Syncing messages in folder '%s' to disk"
-msgstr "‌در حال نسخه‌برداری از پیغام‌ها در پوشه‌ی %s"
+msgstr "‌در حال همگام‌سازی پیغام‌های پوشه‌ی «%s» در دیسک"
 
-#: camel/camel-offline-journal.c:140 camel/camel-offline-journal.c:163
-#, fuzzy, c-format
+#: camel/camel-offline-journal.c:141 camel/camel-offline-journal.c:164
+#, c-format
 msgid "Cannot write offline journal for folder `%s': %s"
-msgstr "‌ایجاد پوشه‌ی %s ممکن نیست: %s"
+msgstr ""
 
 #: camel/camel-provider.c:59
 msgid "Virtual folder email provider"
@@ -1610,7 +1805,7 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:57
 msgid "GSSAPI"
-msgstr ""
+msgstr "GSSAPI"
 
 #: camel/camel-sasl-gssapi.c:59
 msgid "This option will connect to the server using Kerberos 5 authentication."
@@ -1669,7 +1864,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:198 camel/camel-sasl-gssapi.c:246
 #: camel/camel-sasl-gssapi.c:282 camel/camel-sasl-gssapi.c:297
 #: camel/camel-sasl-kerberos4.c:226
-#: camel/providers/imap/camel-imap-store.c:1222
+#: camel/providers/imap/camel-imap-store.c:1243
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -1706,7 +1901,7 @@ msgstr ""
 
 #: camel/camel-sasl-ntlm.c:32
 msgid "NTLM / SPA"
-msgstr ""
+msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:34
 msgid ""
@@ -1720,7 +1915,7 @@ msgstr ""
 
 #: camel/camel-sasl-popb4smtp.c:37
 msgid "POP before SMTP"
-msgstr ""
+msgstr "POP قبل از SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:39
 msgid "This option will authorise a POP connection before attempting SMTP"
@@ -1775,23 +1970,20 @@ msgid "Cannot create CMS message"
 msgstr ""
 
 #: camel/camel-smime-context.c:242
-#, fuzzy
 msgid "Cannot create CMS signed data"
-msgstr "ایجاد پنجره‌ی جدید"
+msgstr ""
 
 #: camel/camel-smime-context.c:248
-#, fuzzy
 msgid "Cannot attach CMS signed data"
-msgstr "پیوست کردن پرونده‌ی %s ممکن نیست: %s"
+msgstr ""
 
 #: camel/camel-smime-context.c:255
 msgid "Cannot attach CMS data"
 msgstr ""
 
 #: camel/camel-smime-context.c:261
-#, fuzzy
 msgid "Cannot create CMS Signer information"
-msgstr "اطلاعات تقویم"
+msgstr ""
 
 #: camel/camel-smime-context.c:267
 msgid "Cannot find certificate chain"
@@ -1819,9 +2011,8 @@ msgid "Cannot add encryption certificate"
 msgstr ""
 
 #: camel/camel-smime-context.c:330
-#, fuzzy
 msgid "Cannot add CMS Signer information"
-msgstr "اطلاعات تقویم"
+msgstr ""
 
 #: camel/camel-smime-context.c:400 camel/camel-smime-context.c:848
 msgid "Cannot create encoder context"
@@ -1861,7 +2052,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:496
 msgid "Signature algorithm unknown"
-msgstr "الگوریتم امضای ناشناخته"
+msgstr "الگوریتم امضای نامعلوم"
 
 #: camel/camel-smime-context.c:498
 msgid "Signature algorithm unsupported"
@@ -1873,7 +2064,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:502
 msgid "Processing error"
-msgstr "خطای فراروند"
+msgstr "خطای پردازش"
 
 #: camel/camel-smime-context.c:539
 msgid "No signed data in signature"
@@ -1994,22 +2185,24 @@ msgid "Cannot create folder: %s: folder exists"
 msgstr "ایجاد پوشه ممکن نیست: %s: پوشه وجود دارد"
 
 #: camel/camel-store.c:390 camel/camel-vee-store.c:367
-#: camel/providers/local/camel-maildir-store.c:221
+#: camel/providers/local/camel-maildir-store.c:217
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "حذف پوشه ممکن نیست: %s: عملیات نامعتبر"
 
 #: camel/camel-store.c:440 camel/camel-vee-store.c:404
-#: camel/providers/local/camel-maildir-store.c:293
+#: camel/providers/local/camel-maildir-store.c:289
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "تغییر نام پوشه ممکن نیست: %s: عملیات نامعتبر"
 
-#: camel/camel-store.c:778
+#. the name of the Trash folder, used for deleted messages
+#: camel/camel-store.c:779 camel/camel-vtrash-folder.c:47
 msgid "Trash"
-msgstr "سطل آشغال"
+msgstr "زباله‌دان"
 
-#: camel/camel-store.c:780
+#. the name of the Junk folder, used for spam messages
+#: camel/camel-store.c:782 camel/camel-vtrash-folder.c:49
 msgid "Junk"
 msgstr "آشغال"
 
@@ -2140,11 +2333,11 @@ msgstr ""
 
 #: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "GOOD"
-msgstr ""
+msgstr "مناسب"
 
 #: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:833
 msgid "BAD"
-msgstr ""
+msgstr "نامناسب"
 
 #: camel/camel-tcp-stream-openssl.c:704
 #, c-format
@@ -2200,12 +2393,12 @@ msgstr ""
 #: camel/camel-url.c:293
 #, c-format
 msgid "Could not parse URL `%s'"
-msgstr "تجزیه‌ی URL '%s' ممکن نیست"
+msgstr "تجزیه‌ی نشانی اینترنتی «%s» ممکن نیست"
 
 #: camel/camel-vee-folder.c:476
 #, c-format
 msgid "Error storing `%s': %s"
-msgstr ""
+msgstr "خطا در ذخیره‌سازی «%s»: %s"
 
 #: camel/camel-vee-folder.c:518
 #, c-format
@@ -2216,46 +2409,46 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:343
+#: camel/camel-vee-store.c:100 camel/camel-vee-store.c:343
 msgid "Unmatched"
 msgstr ""
 
 #: camel/camel-vee-store.c:390
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
-msgstr "حذف پوشه ممکن نیست: %s: چنین پوشه‌ای وجود ندارد"
+msgstr "نمی‌توان پوشه را حذف کرد: %s: چنین پوشه‌ای وجود ندارد"
 
 #: camel/camel-vee-store.c:412
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "تغییر نام پوشه ممکن نیست: %s: پوشه وجود ندارد"
+msgstr "نمی‌توان نام پوشه را تغییر داد: %s: پوشه وجود ندارد"
 
-#: camel/camel-vtrash-folder.c:47
+#: camel/camel-vtrash-folder.c:48
 msgid "Cannot copy messages to the Trash folder"
-msgstr "نسخه‌برداری از پیغام‌ها در پوشه‌ی سطل آشغال ممکن نیست"
+msgstr "نمی‌توان از پیغام‌ها در پوشه‌ی زباله‌دان نسخه‌برداری کرد"
 
-#: camel/camel-vtrash-folder.c:49
+#: camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Junk folder"
-msgstr "نسخه‌برداری از پیغام در پوشه‌ی آشغال ممکن نیست"
+msgstr "نمی‌توان از پیغام در پوشه‌ی آشغال نسخه‌برداری کرد"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:111
+#: camel/providers/imap/camel-imap-folder.c:1980
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:104
-#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/groupwise/camel-groupwise-folder.c:111
+#: camel/providers/imap/camel-imap-folder.c:1980
 #: camel/providers/local/camel-maildir-folder.c:245
-#: camel/providers/local/camel-mbox-folder.c:403
+#: camel/providers/local/camel-mbox-folder.c:340
 #: camel/providers/local/camel-mh-folder.c:203
 msgid "No such message"
-msgstr ""
+msgstr "چنین پیغامی وجود ندارد"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:120
-#: camel/providers/imap4/camel-imap4-folder.c:696
+#: camel/providers/groupwise/camel-groupwise-folder.c:126
+#: camel/providers/imap4/camel-imap4-folder.c:788
 #: camel/providers/nntp/camel-nntp-folder.c:157
 #: camel/providers/nntp/camel-nntp-folder.c:233
 #: camel/providers/nntp/camel-nntp-folder.c:372
@@ -2264,10 +2457,10 @@ msgstr ""
 #: camel/providers/pop3/camel-pop3-folder.c:492
 #: camel/providers/pop3/camel-pop3-folder.c:510
 msgid "User cancelled"
-msgstr ""
+msgstr "کاربر منصرف شد"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:125
-#: camel/providers/imap4/camel-imap4-folder.c:701
+#: camel/providers/groupwise/camel-groupwise-folder.c:131
+#: camel/providers/imap4/camel-imap4-folder.c:793
 #: camel/providers/nntp/camel-nntp-folder.c:148
 #: camel/providers/nntp/camel-nntp-folder.c:150
 #: camel/providers/nntp/camel-nntp-folder.c:159
@@ -2280,49 +2473,46 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:145
-#: camel/providers/imap4/camel-imap4-folder.c:719
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-folder.c:151
+#: camel/providers/imap4/camel-imap4-folder.c:811
 msgid "This message is not available in offline mode."
-msgstr "این پیغام در حال حاضر در دسترس نیست"
+msgstr "این پیغام در حالت منفصل قابل دسترسی نیست."
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:171
-#: camel/providers/groupwise/camel-groupwise-folder.c:272
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-folder.c:179
 msgid "Could not get message"
-msgstr "ایجاد پیغام ممکن نیست."
+msgstr "گرفتن پیغام ممکن نیست"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:471
+#: camel/providers/groupwise/camel-groupwise-folder.c:589
 #: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "بار کردن خلاصه‌ی %s ممکن نیست"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:685
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-folder.c:857
+#, c-format
 msgid "Cannot create message: %s"
-msgstr "ایجاد پیغام ممکن نیست."
+msgstr "پیغام ایجاد نمی‌شود: %s"
 
-#: camel/providers/groupwise/camel-groupwise-folder.c:697
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-folder.c:869
+#, c-format
 msgid "Cannot append message to folder `%s': %s"
-msgstr "‌ایجاد پوشه‌ی %s ممکن نیست: %s"
+msgstr "‌نمی‌توان پیغام را به پوشه‌ی «%s» الحاق کرد: %s"
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:240
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-journal.c:283
+#, c-format
 msgid "Cannot get folder container %s"
-msgstr "ایجاد پوشه ممکن نیست: %s: %s"
+msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:328
-#: camel/providers/imap4/camel-imap4-journal.c:276
+#: camel/providers/groupwise/camel-groupwise-journal.c:347
+#: camel/providers/imap4/camel-imap4-journal.c:320
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-journal.c:344
-#: camel/providers/imap4/camel-imap4-journal.c:292
-#, fuzzy, c-format
+#: camel/providers/groupwise/camel-groupwise-journal.c:363
+#: camel/providers/imap4/camel-imap4-journal.c:336
+#, c-format
 msgid "Cannot append message in offline mode: %s"
-msgstr "ارسال پیغام ممکن نیست: گیرنده‌ای معین نشده است."
+msgstr "نمی‌توان در حالت ونفصل پیغام را الحاق کرد: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:51
 #: camel/providers/imap4/camel-imap4-provider.c:36
@@ -2335,7 +2525,7 @@ msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:56
 #: camel/providers/imap/camel-imap-provider.c:64
-#: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/imap4/camel-imap4-provider.c:56
 #: camel/providers/local/camel-local-provider.c:43
 #: camel/providers/local/camel-local-provider.c:79
 #: camel/providers/local/camel-local-provider.c:99
@@ -2359,110 +2549,107 @@ msgid "Automatically synchronize account locally"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:69
-msgid "Address Book and Calendar"
-msgstr "دفترچه‌ی نشانی و تقویم"
+msgid "SOAP Settings"
+msgstr "تنظیمات SOAP"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:72
-msgid "Post Office Agent:"
-msgstr "مأمور اداره‌ی پست:"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:75
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:78
-msgid "Use Secure Connection (SSL)"
-msgstr "استفاده از اتصال امن (SSL)"
-
-#: camel/providers/groupwise/camel-groupwise-provider.c:91
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:93
+#: camel/providers/groupwise/camel-groupwise-provider.c:87
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:108
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:96
-#: camel/providers/imap4/camel-imap4-provider.c:81
+#: camel/providers/imap4/camel-imap4-provider.c:88
+#: camel/providers/imapp/camel-imapp-provider.c:66
 #: camel/providers/nntp/camel-nntp-provider.c:72
 #: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "گذرواژه"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:110
+#: camel/providers/groupwise/camel-groupwise-provider.c:104
 #, fuzzy
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "این گزینه با استفاده از گذرواژه‌ی متن ساده به کارگزار IMAP متصل خواهد شد."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:267
-#, fuzzy
+#: camel/providers/groupwise/camel-groupwise-store.c:270
 msgid "Host or user not availbale in url"
-msgstr "ویرایش‌گر مقوله موجود نیست."
+msgstr "میزبان یا کاربر در نشانی اینترنتی موجود نیست"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:359
+#: camel/providers/groupwise/camel-groupwise-store.c:361
 #, fuzzy, c-format
 msgid "%sPlease enter the Groupwise password for %s@%s"
 msgstr "%sلطفاْ گذرواژه‌ی IMAP برای %s@%s را وارد کنید"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:373
-#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/groupwise/camel-groupwise-store.c:375
+#: camel/providers/imap/camel-imap-store.c:1322
 msgid "You didn't enter a password."
 msgstr "گذرواژه‌ای وارد نکردید."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:382
+#: camel/providers/groupwise/camel-groupwise-store.c:389
 #, fuzzy
 msgid "Unable to authenticate to GroupWise server."
 msgstr ""
 "تأیید هویت با کارگزار IMAP امکان پذیر نیست.%s\n"
 "\n"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:479
-#: camel/providers/imap/camel-imap-store.c:1852
-#: camel/providers/imap/camel-imap-store.c:2042
+#: camel/providers/groupwise/camel-groupwise-store.c:430
+msgid "Some features may not work correctly with your current server version"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-store.c:501
+#: camel/providers/imap/camel-imap-store.c:1873
+#: camel/providers/imap/camel-imap-store.c:2063
 #, c-format
 msgid "No such folder %s"
 msgstr "پوشه‌ی %s وجود ندارد"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:499
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
+#: camel/providers/groupwise/camel-groupwise-store.c:551
+#: camel/providers/groupwise/camel-groupwise-store.c:618
+#: camel/providers/imap/camel-imap-folder.c:2288
+#: camel/providers/imap/camel-imap-folder.c:2358
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-store.c:610
+#: camel/providers/groupwise/camel-groupwise-store.c:753
 #, fuzzy
 msgid "Cannot get folder info in offline mode."
 msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:781
+#: camel/providers/groupwise/camel-groupwise-store.c:966
 #, fuzzy
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:830
+#: camel/providers/groupwise/camel-groupwise-store.c:1017
 #, fuzzy
 msgid "Cannot delete GroupWise folders in offline mode."
 msgstr "حذف پوشه‌ی '%s' ممکن نیست: پوشه‌ی خاص"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:873
+#: camel/providers/groupwise/camel-groupwise-store.c:1063
 #, fuzzy
 msgid "Cannot rename GroupWise folders in offline mode."
 msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
 
-#: camel/providers/groupwise/camel-groupwise-store.c:879
+#: camel/providers/groupwise/camel-groupwise-store.c:1081
 #, fuzzy, c-format
 msgid "Cannot rename Groupwise folder `%s' to `%s'"
 msgstr "تغییر نام پوشه‌ی '%s' به '%s' ممکن نیست: فرمان نامناسب"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:911
+#: camel/providers/groupwise/camel-groupwise-store.c:1117
 #, fuzzy, c-format
 msgid "GroupWise server %s"
 msgstr "‏‏کارگزار %s IMAP"
 
-#: camel/providers/groupwise/camel-groupwise-store.c:913
+#: camel/providers/groupwise/camel-groupwise-store.c:1119
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr ""
@@ -2478,69 +2665,51 @@ msgid "Groupwise mail delivery via %s"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-transport.c:159
-#, fuzzy
 msgid "Sending Message"
 msgstr "در حال ارسال پیغام"
 
-#: camel/providers/groupwise/camel-gw-listener.c:406
-msgid "Tasks"
-msgstr "تکلیف‌ها"
-
-#: camel/providers/groupwise/camel-gw-listener.c:436
-#, fuzzy
-msgid "Checklist"
-msgstr "فهرست"
-
-#: camel/providers/groupwise/camel-gw-listener.c:483
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s گذرواژه‌ی برای %s (کاربر %s) را وارد کنید"
-
-#: camel/providers/groupwise/camel-gw-listener.c:494
-msgid "Failed to authenticate.\n"
-msgstr "تأیید هویت شکست خورد.\n"
-
 #: camel/providers/imap/camel-imap-command.c:219
 #: camel/providers/imap/camel-imap-command.c:258
-#: camel/providers/imap/camel-imap-command.c:460
-#: camel/providers/imap/camel-imap-store.c:3209
+#: camel/providers/imap/camel-imap-command.c:463
+#: camel/providers/imap/camel-imap-store.c:3238
 msgid "Operation cancelled"
-msgstr "عملیات لغو شد"
+msgstr "از عملیات صرف نظر شد"
 
 #: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-store.c:3212
+#: camel/providers/imap/camel-imap-store.c:3241
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "اتصال کارگزار به طور غیر منتظره قطع شد: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:321
+#. we might get a ']' from a BAD response since we +12, but who cares?
+#: camel/providers/imap/camel-imap-command.c:324
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:390
+#: camel/providers/imap/camel-imap-command.c:393
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "پاسخ غیر منتظره از کارگزار IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap/camel-imap-command.c:403
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "فرمان IMAP شکست خورد: %s"
 
-#: camel/providers/imap/camel-imap-command.c:470
+#: camel/providers/imap/camel-imap-command.c:473
 msgid "Server response ended too soon."
 msgstr "پاسخ کارگزار زودتر از موقع تمام شد."
 
-#: camel/providers/imap/camel-imap-command.c:675
+#: camel/providers/imap/camel-imap-command.c:680
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "پاسخ کارگزار IMAP حاوی اطلاعات %s نبود"
 
-#: camel/providers/imap/camel-imap-command.c:711
+#: camel/providers/imap/camel-imap-command.c:716
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -2556,38 +2725,38 @@ msgstr "پوشه روی کارگزار نابود و مجدداْ ایجاد ش
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:573
-#: camel/providers/imap4/camel-imap4-summary.c:1270
+#: camel/providers/imap4/camel-imap4-summary.c:1472
 msgid "Scanning for changed messages"
 msgstr "پویش به دنبال پیغام‌های تغییر‌ یافته"
 
-#: camel/providers/imap/camel-imap-folder.c:1939
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "بازیابی پیغام امکان پذیر نیست: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
+#: camel/providers/imap/camel-imap-folder.c:2022
+#: camel/providers/imap/camel-imap-folder.c:2624
 #: camel/providers/nntp/camel-nntp-folder.c:221
 msgid "This message is not currently available"
-msgstr "این پیغام در حال حاضر در دسترس نیست"
+msgstr "این پیغام در حال حاضر قابل دسترسی نیست"
 
-#: camel/providers/imap/camel-imap-folder.c:2464
+#: camel/providers/imap/camel-imap-folder.c:2465
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2472
+#: camel/providers/imap/camel-imap-folder.c:2473
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2485
+#: camel/providers/imap/camel-imap-folder.c:2486
 #, c-format
 msgid ""
 "Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2661
+#: camel/providers/imap/camel-imap-folder.c:2662
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2620,62 +2789,60 @@ msgid "C_heck for new messages in all folders"
 msgstr "‌در حال نسخه‌برداری از پیغام‌ها در پوشه‌ی %s"
 
 #: camel/providers/imap/camel-imap-provider.c:49
+#: camel/providers/imap4/camel-imap4-provider.c:41
 msgid "Connection to Server"
 msgstr "اتصال به کارگزار"
 
 #: camel/providers/imap/camel-imap-provider.c:51
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:43
 msgid "_Use custom command to connect to server"
-msgstr "استفاده از فرمان سفارشی برای اتصال به کارگزار"
+msgstr "است_فاده از فرمان سفارشی برای اتصال به کارگزار"
 
 #: camel/providers/imap/camel-imap-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:45
 msgid "Command:"
 msgstr "فرمان:"
 
 #: camel/providers/imap/camel-imap-provider.c:56
-#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/imap4/camel-imap4-provider.c:48
 #: camel/providers/nntp/camel-nntp-provider.c:42
 msgid "Folders"
 msgstr "پوشه‌ها"
 
 #: camel/providers/imap/camel-imap-provider.c:58
-#: camel/providers/imap4/camel-imap4-provider.c:43
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:50
 msgid "_Show only subscribed folders"
-msgstr "نمایش فقط پوشه‌های آبونه شده"
+msgstr "_نشان دادن فقط پوشه‌های آبونه شده"
 
 #: camel/providers/imap/camel-imap-provider.c:60
-#: camel/providers/imap4/camel-imap4-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:52
 msgid "O_verride server-supplied folder namespace"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:62
-#: camel/providers/imap4/camel-imap4-provider.c:47
+#: camel/providers/imap4/camel-imap4-provider.c:54
 msgid "Namespace"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:66
-#: camel/providers/imap4/camel-imap4-provider.c:51
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:58
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "اعمال صافی‌ها بر پیغام‌های جدید در INBOX"
+msgstr "اِ_عمال صافی‌ها بر پیغام‌های جدید در INBOX روی این کارگزار"
 
 #: camel/providers/imap/camel-imap-provider.c:68
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:60
 msgid "Check new messages for _Junk contents"
-msgstr "صافی پیغام‌های انتخاب شده برای وضعیت آشغال"
+msgstr "بررسی پیغام‌های جدید به دنبال محتویات آش_غال"
 
 #: camel/providers/imap/camel-imap-provider.c:70
-#: camel/providers/imap4/camel-imap4-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:62
 msgid "Only check for Junk messa_ges in the INBOX folder"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:72
-#: camel/providers/imap4/camel-imap4-provider.c:57
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:64
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "گشتن خودکار به دنبال نامه‌ی _جدید در هر"
+msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
@@ -2686,105 +2853,123 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "برای خواندن و ذخیره‌ی نامه روی کارگزارهای IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:98
+#: camel/providers/imapp/camel-imapp-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "این گزینه با استفاده از گذرواژه‌ی متن ساده به کارگزار IMAP متصل خواهد شد."
 
 #: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:206
+#: camel/providers/imap4/camel-imap4-store.c:215
 #, c-format
 msgid "IMAP server %s"
 msgstr "‏‏کارگزار %s IMAP"
 
 #: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:217
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:535
-#: camel/providers/imap/camel-imap-store.c:550
-#: camel/providers/imap4/camel-imap4-store.c:240
-#: camel/providers/imap4/camel-imap4-store.c:255
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap4/camel-imap4-store.c:322
+#: camel/providers/imap4/camel-imap4-store.c:337
 #: camel/providers/nntp/camel-nntp-store.c:200
 #: camel/providers/nntp/camel-nntp-store.c:215
 #: camel/providers/pop3/camel-pop3-store.c:169
 #: camel/providers/pop3/camel-pop3-store.c:184
 #: camel/providers/smtp/camel-smtp-transport.c:257
 #: camel/providers/smtp/camel-smtp-transport.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to %s: %s"
-msgstr "اتصال به  %s ممکن نیست(درگاه %s(: %s"
+msgstr "اتصال به  %s ممکن نیست: %s"
 
-#: camel/providers/imap/camel-imap-store.c:536
-#: camel/providers/imap4/camel-imap4-store.c:241
+#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap4/camel-imap4-store.c:323
 #: camel/providers/nntp/camel-nntp-store.c:201
 #: camel/providers/pop3/camel-pop3-store.c:170
 #: camel/providers/smtp/camel-smtp-transport.c:258
 msgid "SSL unavailable"
 msgstr "SSL موجود نیست"
 
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:817
-#: camel/providers/imap4/camel-imap4-store.c:252
+#: camel/providers/imap/camel-imap-store.c:565
+#: camel/providers/imap/camel-imap-store.c:835
+#: camel/providers/imap4/camel-imap4-store.c:270
+#: camel/providers/imap4/camel-imap4-store.c:334
+#: camel/providers/imapp/camel-imapp-store.c:248
 #: camel/providers/nntp/camel-nntp-store.c:212
 #: camel/providers/nntp/camel-nntp-store.c:231
 #: camel/providers/pop3/camel-pop3-store.c:181
 #: camel/providers/smtp/camel-smtp-transport.c:269
 msgid "Connection cancelled"
-msgstr "اتصال لغو شد"
+msgstr "از اتصال صرف نظر شد"
 
-#: camel/providers/imap/camel-imap-store.c:655
-#: camel/providers/imap/camel-imap-store.c:677
-#: camel/providers/imap/camel-imap-store.c:683
-#: camel/providers/imap4/camel-imap4-store.c:280
-#: camel/providers/imap4/camel-imap4-store.c:293
-#: camel/providers/imap4/camel-imap4-store.c:309
+#: camel/providers/imap/camel-imap-store.c:673
+#: camel/providers/imap/camel-imap-store.c:695
+#: camel/providers/imap/camel-imap-store.c:701
+#: camel/providers/imap4/camel-imap4-store.c:362
+#: camel/providers/imap4/camel-imap4-store.c:375
+#: camel/providers/imap4/camel-imap4-store.c:391
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
+msgstr "اتصال به کارگزار %s IMAP در حالت امن شکست خورد: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:674
 #: camel/providers/smtp/camel-smtp-transport.c:326
-#, fuzzy
 msgid "STARTTLS not supported"
-msgstr "پروتکل پشتیبانی نمی‌شود"
+msgstr "پشتیبانی نمی‌شود STARTTLS"
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/imap4/camel-imap4-store.c:281
+#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap4/camel-imap4-store.c:363
 #: camel/providers/pop3/camel-pop3-store.c:246
 msgid "SSL negotiations failed"
 msgstr "مذاکره‌ی SSL شکست خورد"
 
-#: camel/providers/imap/camel-imap-store.c:684
-#: camel/providers/imap4/camel-imap4-store.c:310
+#: camel/providers/imap/camel-imap-store.c:702
+#: camel/providers/imap4/camel-imap4-store.c:392
 #: camel/providers/pop3/camel-pop3-store.c:252
 #: camel/providers/smtp/camel-smtp-transport.c:365
 msgid "SSL is not available in this build"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:820
+#: camel/providers/imap/camel-imap-store.c:838
+#: camel/providers/imap4/camel-imap4-store.c:273
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1254
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: camel/providers/imap/camel-imap-store.c:1019
+#: camel/providers/imap/camel-imap-store.c:2427
+#: camel/providers/imap4/camel-imap4-store-summary.c:368
+#: camel/providers/imap4/camel-imap4-store.c:1267
+#: camel/providers/local/camel-maildir-folder.c:75
+#: camel/providers/local/camel-maildir-store.c:217
+#: camel/providers/local/camel-maildir-store.c:289
+#: camel/providers/local/camel-maildir-store.c:511
+#: camel/providers/local/camel-maildir-store.c:524
+#: camel/providers/local/camel-spool-store.c:460
+msgid "Inbox"
+msgstr "دریافتی"
+
+#: camel/providers/imap/camel-imap-store.c:1275
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1264
-#: camel/providers/smtp/camel-smtp-transport.c:498
+#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/smtp/camel-smtp-transport.c:501
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "تأیید هویت از نوع %s پشتیبانی نمی‌شود"
 
-#: camel/providers/imap/camel-imap-store.c:1287
+#: camel/providers/imap/camel-imap-store.c:1308
+#: camel/providers/imapp/camel-imapp-store.c:364
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sلطفاْ گذرواژه‌ی IMAP برای %s@%s را وارد کنید"
 
-#: camel/providers/imap/camel-imap-store.c:1330
+#: camel/providers/imap/camel-imap-store.c:1351
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2794,264 +2979,263 @@ msgstr ""
 "تأیید هویت با کارگزار IMAP امکان پذیر نیست.%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2248
-#: camel/providers/imap4/camel-imap4-store.c:770
+#: camel/providers/imap/camel-imap-store.c:1891
+#: camel/providers/imap/camel-imap-store.c:2269
+#: camel/providers/imap4/camel-imap4-store.c:856
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "نام پرونده‌ی \"%s\" نامعتبر است چون حاوی نویسه‌ی \"%c\" است"
+msgstr "نام پرونده‌ی «%s» نامعتبر است چون حاوی نویسه‌ی «%c» است"
 
-#: camel/providers/imap/camel-imap-store.c:1928
-#: camel/providers/imap/camel-imap-store.c:2309
+#: camel/providers/imap/camel-imap-store.c:1949
+#: camel/providers/imap/camel-imap-store.c:2331
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "پوشه‌ی پدر اجازه‌ی داشتن زیرپوشه را ندارد"
 
-#: camel/providers/imap/camel-imap-store.c:1983
-#: camel/providers/local/camel-maildir-store.c:192
-#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/imap/camel-imap-store.c:2004
+#: camel/providers/local/camel-maildir-store.c:190
+#: camel/providers/local/camel-mbox-store.c:199
 #: camel/providers/local/camel-mh-store.c:237
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
-msgstr "ایجاد پوشه‌ی '%s' ممکن نیست: پوشه وجود دارد."
+msgstr "نمی‌توان پوشه‌ی «%s» را ایجاد کرد: پوشه وجود دارد."
 
-#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap/camel-imap-store.c:2280
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "پوشه‌ی پدر ناشناخته: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:551
-#: camel/providers/imap4/camel-imap4-command.c:558
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
-msgstr "ارسال فرمان به کارگزار IMAP %s شکست خورد: %s"
+msgstr "ارسال فرمان به کارگزار %s IMAP شکست خورد: %s"
 
-#: camel/providers/imap4/camel-imap4-command.c:661
+#: camel/providers/imap4/camel-imap4-command.c:660
 #, c-format
 msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "پاسخ غیرمنتظره از کارگزار IMAP4 %s: %s"
+msgstr "پاسخ غیرمنتظره از کارگزار %s IMAP4: %s"
 
-#: camel/providers/imap4/camel-imap4-engine.c:216
+#: camel/providers/imap4/camel-imap4-engine.c:222
 #, c-format
 msgid "Unexpected greeting from IMAP server %s."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:410
+#: camel/providers/imap4/camel-imap4-engine.c:432
 #, c-format
 msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "انتخاب پوشه‌ی '%s' ممکن نیست: نام صندوق پستی نامعتبر است"
+msgstr "نمی‌توان پوشه‌ی «%s» را انتخاب کرد: نام صندوق پستی نامعتبر است"
 
-#: camel/providers/imap4/camel-imap4-engine.c:416
+#: camel/providers/imap4/camel-imap4-engine.c:438
 #, c-format
 msgid "Cannot select folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1464
-#: camel/providers/imap4/camel-imap4-engine.c:1503
-#: camel/providers/imap4/camel-imap4-engine.c:1548
-#: camel/providers/imap4/camel-imap4-engine.c:1604
+#: camel/providers/imap4/camel-imap4-engine.c:1549
+#: camel/providers/imap4/camel-imap4-engine.c:1588
+#: camel/providers/imap4/camel-imap4-engine.c:1633
+#: camel/providers/imap4/camel-imap4-engine.c:1689
 #, c-format
 msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:306
-#, fuzzy, c-format
+#: camel/providers/imap4/camel-imap4-folder.c:85
+msgid ""
+"Enable Mailing-List detection required for some filter and vFolder rules"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:398
+#, c-format
 msgid "Cannot access folder `%s': %s"
-msgstr "‌ایجاد پوشه‌ی %s ممکن نیست: %s"
+msgstr "‌دسترسی به پوشه‌ی «%s» ممکن نیست: %s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:365
+#: camel/providers/imap4/camel-imap4-folder.c:457
 #, c-format
 msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:371
+#: camel/providers/imap4/camel-imap4-folder.c:463
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:512
+#: camel/providers/imap4/camel-imap4-folder.c:604
 #, c-format
 msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:517
+#: camel/providers/imap4/camel-imap4-folder.c:609
 #, c-format
 msgid "Cannot expunge folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:773
+#: camel/providers/imap4/camel-imap4-folder.c:865
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:778
+#: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:911
+#: camel/providers/imap4/camel-imap4-folder.c:1003
 #, c-format
 msgid "Cannot append message to folder `%s': Unknown error"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:940
+#: camel/providers/imap4/camel-imap4-folder.c:1032
 #, c-format
 msgid "Cannot append message to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:1048
+#: camel/providers/imap4/camel-imap4-folder.c:1144
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:1052
+#: camel/providers/imap4/camel-imap4-folder.c:1148
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:1060
+#: camel/providers/imap4/camel-imap4-folder.c:1156
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:1064
+#: camel/providers/imap4/camel-imap4-folder.c:1160
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:64
-msgid "IMAPv4rev1"
-msgstr ""
+#: camel/providers/imap4/camel-imap4-provider.c:71
+msgid "IMAP4rev1"
+msgstr "IMAP4rev1"
 
-#: camel/providers/imap4/camel-imap4-provider.c:66
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-provider.c:73
 msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "برای خواندن و ذخیره‌ی نامه روی کارگزارهای IMAP."
+msgstr "برای خواندن و ذخیره‌ی نامه روی کارگزارهای IMAP4rev1."
 
-#: camel/providers/imap4/camel-imap4-provider.c:83
+#: camel/providers/imap4/camel-imap4-provider.c:90
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:391
+#: camel/providers/imap4/camel-imap4-store.c:477
 #, c-format
 msgid ""
 "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:436
+#: camel/providers/imap4/camel-imap4-store.c:522
 #, c-format
 msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:506
+#: camel/providers/imap4/camel-imap4-store.c:592
 #, c-format
 msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:668
-#: camel/providers/imap4/camel-imap4-store.c:780
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:754
+#: camel/providers/imap4/camel-imap4-store.c:866
 msgid "Cannot create IMAP folders in offline mode."
-msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
+msgstr "نمی‌توان در حالت منفصل پوشه‌ی IMAP ایجاد کرد."
 
-#: camel/providers/imap4/camel-imap4-store.c:707
+#: camel/providers/imap4/camel-imap4-store.c:793
 #, c-format
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:828
+#: camel/providers/imap4/camel-imap4-store.c:914
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:834
+#: camel/providers/imap4/camel-imap4-store.c:920
 #, c-format
 msgid "Cannot create folder `%s': Bad command"
-msgstr "ایجاد پوشه‌ی '%s' ممکن نیست: فرمان نامناسب"
+msgstr "نمی‌توان پوشه‌ی «%s» را ایجاد کرد: فرمان نامناسب"
 
-#: camel/providers/imap4/camel-imap4-store.c:865
+#: camel/providers/imap4/camel-imap4-store.c:951
 #, c-format
 msgid "Cannot delete folder `%s': Special folder"
-msgstr "حذف پوشه‌ی '%s' ممکن نیست: پوشه‌ی خاص"
+msgstr "نمی‌توان پوشه‌ی «%s» را حذف کرد: پوشه‌ی خاص"
 
-#: camel/providers/imap4/camel-imap4-store.c:872
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:958
 msgid "Cannot delete IMAP folders in offline mode."
-msgstr "حذف پوشه‌ی '%s' ممکن نیست: پوشه‌ی خاص"
+msgstr "نمی‌توان پوشه‌های IMAP را در حالت منفصل حذف کرد."
 
-#: camel/providers/imap4/camel-imap4-store.c:931
+#: camel/providers/imap4/camel-imap4-store.c:1017
 #, c-format
 msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:936
+#: camel/providers/imap4/camel-imap4-store.c:1022
 #, c-format
 msgid "Cannot delete folder `%s': Bad command"
-msgstr "حذف پوشه‌ی '%s' ممکن نیست: فرمان نامناسب"
+msgstr "نمی‌توان پوشه‌ی «%s» را حذف کرد: فرمان نامناسب"
 
-#: camel/providers/imap4/camel-imap4-store.c:956
+#: camel/providers/imap4/camel-imap4-store.c:1042
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "تغییر نام پوشه‌ی '%s' به '%s' ممکن نیست: پوشه‌ی خاص"
+msgstr "نمی‌توان نام پوشه‌ی «%s» را به «%s» تغییر داد: پوشه‌ی خاص"
 
-#: camel/providers/imap4/camel-imap4-store.c:963
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1049
 msgid "Cannot rename IMAP folders in offline mode."
-msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
+msgstr "نمی‌توان نام پوشه‌های IMAP را در حالت منفصل تغییر داد."
 
-#: camel/providers/imap4/camel-imap4-store.c:994
+#: camel/providers/imap4/camel-imap4-store.c:1080
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:999
+#: camel/providers/imap4/camel-imap4-store.c:1085
 #, c-format
 msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "تغییر نام پوشه‌ی '%s' به '%s' ممکن نیست: فرمان نامناسب"
+msgstr "نمی‌توان نام پوشه‌ی «%s» را به «%s» تغییر داد: فرمان نامناسب"
 
-#: camel/providers/imap4/camel-imap4-store.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1432
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1250
+#: camel/providers/imap4/camel-imap4-store.c:1434
 msgid "Bad command"
-msgstr "فرمان نامناسب:"
+msgstr "فرمان نامناسب"
 
-#: camel/providers/imap4/camel-imap4-store.c:1288
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-store.c:1472
 msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
+msgstr "نمی‌توان در حالت منفصل آبونه‌ی پوشه‌های IMAP شد."
 
-#: camel/providers/imap4/camel-imap4-store.c:1333
+#: camel/providers/imap4/camel-imap4-store.c:1517
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1338
+#: camel/providers/imap4/camel-imap4-store.c:1522
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1360
+#: camel/providers/imap4/camel-imap4-store.c:1544
 msgid "Cannot unsubscribe from IMAP folders in offline mode."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1405
+#: camel/providers/imap4/camel-imap4-store.c:1589
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1410
+#: camel/providers/imap4/camel-imap4-store.c:1594
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-summary.c:1294
-#, fuzzy
+#: camel/providers/imap4/camel-imap4-summary.c:1497
 msgid "Fetching envelopes for new messages"
-msgstr "پویش به دنبال پیغام‌های تغییر‌ یافته"
+msgstr "در حال آوردن پاکت برای پیغام‌های جدید"
 
 #: camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
@@ -3067,25 +3251,52 @@ msgstr ""
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-folder.c:179
+#: camel/providers/imapp/camel-imapp-provider.c:40
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Message storage"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-provider.c:48
+msgid "IMAP+"
+msgstr "IMAP+"
+
+#: camel/providers/imapp/camel-imapp-provider.c:50
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:251
+#, c-format
+msgid "Could not connect to %s (port %s): %s"
+msgstr "اتصال به  %s ممکن نیست(درگاه %s(: %s"
+
+#: camel/providers/imapp/camel-imapp-store.c:348
+#, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "اتصال به کارگزار POP روی %s ممکن نیست"
+
+#: camel/providers/local/camel-local-folder.c:173
 msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:391
+#: camel/providers/local/camel-local-folder.c:378
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:395
-#: camel/providers/local/camel-local-folder.c:398
+#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:385
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:402
+#: camel/providers/local/camel-local-folder.c:389
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -3104,7 +3315,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-provider.c:68
 msgid "Local delivery"
-msgstr ""
+msgstr "تحویل محلی"
 
 #: camel/providers/local/camel-local-provider.c:69
 msgid ""
@@ -3139,59 +3350,59 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:254
-#: camel/providers/local/camel-mbox-store.c:353
-#: camel/providers/local/camel-spool-store.c:117
+#: camel/providers/local/camel-local-store.c:150
+#: camel/providers/local/camel-local-store.c:261
+#: camel/providers/local/camel-mbox-store.c:342
+#: camel/providers/local/camel-spool-store.c:125
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:150
+#: camel/providers/local/camel-local-store.c:157
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:159
-#: camel/providers/local/camel-local-store.c:167
-#: camel/providers/local/camel-local-store.c:265
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:272
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:179
+#: camel/providers/local/camel-local-store.c:186
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:225
+#: camel/providers/local/camel-local-store.c:232
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:334
+#: camel/providers/local/camel-local-store.c:341
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:399
+#: camel/providers/local/camel-local-store.c:406
 #, c-format
 msgid "Could not rename '%s': %s"
-msgstr "تغییر نام '%s' ممکن نیست: %s"
+msgstr "تغییر نام «%s» ممکن نیست: %s"
 
-#: camel/providers/local/camel-local-store.c:424
-#: camel/providers/local/camel-mbox-store.c:282
+#: camel/providers/local/camel-local-store.c:431
+#: camel/providers/local/camel-mbox-store.c:271
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:434
-#: camel/providers/local/camel-mbox-store.c:294
+#: camel/providers/local/camel-local-store.c:441
+#: camel/providers/local/camel-mbox-store.c:283
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:457
-#: camel/providers/local/camel-mbox-store.c:318
+#: camel/providers/local/camel-local-store.c:464
+#: camel/providers/local/camel-mbox-store.c:307
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
@@ -3205,16 +3416,6 @@ msgstr "ذخیره‌ی خلاصه ممکن نیست: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: camel/providers/local/camel-maildir-folder.c:75
-#: camel/providers/local/camel-maildir-store.c:221
-#: camel/providers/local/camel-maildir-store.c:293
-#: camel/providers/local/camel-maildir-store.c:515
-#: camel/providers/local/camel-maildir-store.c:528
-#: camel/providers/local/camel-spool-store.c:452
-msgid "Inbox"
-msgstr "دریافتی"
-
 #: camel/providers/local/camel-maildir-folder.c:215
 msgid "Maildir append message cancelled"
 msgstr ""
@@ -3227,10 +3428,10 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-maildir-folder.c:258
 #: camel/providers/local/camel-maildir-folder.c:267
-#: camel/providers/local/camel-mbox-folder.c:402
-#: camel/providers/local/camel-mbox-folder.c:421
-#: camel/providers/local/camel-mbox-folder.c:452
-#: camel/providers/local/camel-mbox-folder.c:460
+#: camel/providers/local/camel-mbox-folder.c:339
+#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:389
+#: camel/providers/local/camel-mbox-folder.c:397
 #: camel/providers/local/camel-mh-folder.c:202
 #: camel/providers/local/camel-mh-folder.c:213
 #: camel/providers/local/camel-mh-folder.c:222
@@ -3244,50 +3445,50 @@ msgstr ""
 msgid "Invalid message contents"
 msgstr "محتویات پیغام نامعتبر است"
 
-#: camel/providers/local/camel-maildir-store.c:148
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-mbox-store.c:182
-#: camel/providers/local/camel-mbox-store.c:194
+#: camel/providers/local/camel-maildir-store.c:146
+#: camel/providers/local/camel-maildir-store.c:171
+#: camel/providers/local/camel-mbox-store.c:171
+#: camel/providers/local/camel-mbox-store.c:183
 #, c-format
 msgid "Cannot create folder `%s': %s"
-msgstr "‌ایجاد پوشه‌ی %s ممکن نیست: %s"
+msgstr "‌نمی‌توان پوشه‌ی «%s» را ایجاد کرد: %s"
 
-#: camel/providers/local/camel-maildir-store.c:161
-#: camel/providers/local/camel-mbox-store.c:152
+#: camel/providers/local/camel-maildir-store.c:159
+#: camel/providers/local/camel-mbox-store.c:141
 #: camel/providers/local/camel-mh-store.c:205
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-maildir-store.c:163
+#: camel/providers/local/camel-mbox-store.c:149
 #: camel/providers/local/camel-mh-store.c:212
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:189
+#: camel/providers/local/camel-maildir-store.c:187
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:236
-#: camel/providers/local/camel-maildir-store.c:274
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:270
 #: camel/providers/local/camel-mh-store.c:261
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "حذف پوشه‌ی '%s' ممکن نیست: %s"
 
-#: camel/providers/local/camel-maildir-store.c:238
+#: camel/providers/local/camel-maildir-store.c:234
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:440
-#: camel/providers/local/camel-spool-store.c:319
-#: camel/providers/local/camel-spool-store.c:333
+#: camel/providers/local/camel-maildir-store.c:436
+#: camel/providers/local/camel-spool-store.c:327
+#: camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Could not scan folder `%s': %s"
-msgstr "پویش پوشه‌ی '%s' ممکن نیست: %s"
+msgstr "پویش پوشه‌ی «%s» ممکن نیست: %s"
 
 #: camel/providers/local/camel-maildir-summary.c:425
 #: camel/providers/local/camel-maildir-summary.c:556
@@ -3309,93 +3510,93 @@ msgstr ""
 #: camel/providers/local/camel-mbox-summary.c:680
 #: camel/providers/local/camel-spool-summary.c:140
 msgid "Storing folder"
-msgstr ""
+msgstr "در حال ذخیره‌سازی پوشه"
 
-#: camel/providers/local/camel-mbox-folder.c:210
-#: camel/providers/local/camel-spool-folder.c:176
+#: camel/providers/local/camel-mbox-folder.c:147
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:269
+#: camel/providers/local/camel-mbox-folder.c:206
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:329
+#: camel/providers/local/camel-mbox-folder.c:266
 msgid "Mail append cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:332
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:453
+#: camel/providers/local/camel-mbox-folder.c:390
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:461
+#: camel/providers/local/camel-mbox-folder.c:398
 #: camel/providers/local/camel-mh-folder.c:223
 msgid "Message construction failed."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:174
-#: camel/providers/local/camel-mbox-store.c:359
+#: camel/providers/local/camel-mbox-store.c:163
+#: camel/providers/local/camel-mbox-store.c:348
 msgid "Cannot create a folder by this name."
-msgstr "ایجاد پوشه‌ای با این نام ممکن نیست."
+msgstr "نمی‌توان پوشه‌ای با این نام ایجاد کرد."
 
-#: camel/providers/local/camel-mbox-store.c:204
+#: camel/providers/local/camel-mbox-store.c:193
 #, c-format
 msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 
+#: camel/providers/local/camel-mbox-store.c:223
 #: camel/providers/local/camel-mbox-store.c:234
-#: camel/providers/local/camel-mbox-store.c:245
-#: camel/providers/local/camel-mbox-store.c:268
+#: camel/providers/local/camel-mbox-store.c:257
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
 "%s"
-msgstr "حذف پوشه‌ی '%s' ممکن نیست:/n%s"
+msgstr "حذف پوشه‌ی «%s» ممکن نیست:/n%s"
 
-#: camel/providers/local/camel-mbox-store.c:253
+#: camel/providers/local/camel-mbox-store.c:242
 #, c-format
 msgid "`%s' is not a regular file."
-msgstr "'%s' یک پرونده‌ی متعارف نیست."
+msgstr "«%s» یک پرونده‌ی متعارف نیست."
 
-#: camel/providers/local/camel-mbox-store.c:260
+#: camel/providers/local/camel-mbox-store.c:249
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
-msgstr "پوشه‌ی '%s' خالی نیست. حذف نشد."
+msgstr "پوشه‌ی «%s» خالی نیست. حذف نشد."
 
-#: camel/providers/local/camel-mbox-store.c:372
+#: camel/providers/local/camel-mbox-store.c:361
 #, c-format
 msgid "Cannot create directory `%s': %s."
-msgstr "ایجاد شاخه‌ی '%s' ممکن نیست: %s."
+msgstr "ایجاد شاخه‌ی «%s» ممکن نیست: %s."
 
-#: camel/providers/local/camel-mbox-store.c:386
+#: camel/providers/local/camel-mbox-store.c:375
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "ایجاد پوشه ممکن نیست: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:388
+#: camel/providers/local/camel-mbox-store.c:377
 msgid "Folder already exists"
 msgstr "پوشه از قبل وجود دارد"
 
-#: camel/providers/local/camel-mbox-store.c:470
+#: camel/providers/local/camel-mbox-store.c:459
 msgid "The new folder name is illegal."
-msgstr "نام جدید پشوه غیرمجاز است."
+msgstr "نام جدید پوشه غیرمجاز است."
 
-#: camel/providers/local/camel-mbox-store.c:483
+#: camel/providers/local/camel-mbox-store.c:472
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
-msgstr "تغییر نام '%s' ممکن نیست: '%s': %s"
+msgstr "تغییر نام «%s» ممکن نیست: «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:558
+#: camel/providers/local/camel-mbox-store.c:547
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
-msgstr "تغییر نام '%s' به %s ممکن نیست: %s"
+msgstr "تغییر نام «%s» به %s ممکن نیست: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:422
 #, c-format
@@ -3452,7 +3653,7 @@ msgstr ""
 #: camel/providers/local/camel-spool-summary.c:337
 #, c-format
 msgid "Unknown error: %s"
-msgstr "خطای ناشناخته: %s"
+msgstr "خطای نامعلوم: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:894
 #, c-format
@@ -3494,64 +3695,64 @@ msgstr ""
 msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:123
+#: camel/providers/local/camel-spool-store.c:131
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:135
+#: camel/providers/local/camel-spool-store.c:143
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:154
+#: camel/providers/local/camel-spool-store.c:162
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid "Folder `%s' does not exist."
-msgstr ""
+msgstr "پوشه‌ی «%s» وجود ندارد."
 
-#: camel/providers/local/camel-spool-store.c:173
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:181
+#: camel/providers/local/camel-spool-store.c:189
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:198
+#: camel/providers/local/camel-spool-store.c:206
 msgid "Store does not support an INBOX"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:210
+#: camel/providers/local/camel-spool-store.c:218
 #, c-format
 msgid "Spool folder tree %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:218
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:226
+#: camel/providers/local/camel-spool-store.c:234
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
@@ -3576,24 +3777,6 @@ msgid ""
 "Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1156
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "ارسال نام کاربر به کارگزار شکست خورد"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-folder.c:177
 #: camel/providers/nntp/camel-nntp-folder.c:209
 #, c-format
@@ -3616,21 +3799,6 @@ msgstr ""
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
@@ -3657,12 +3825,12 @@ msgstr ""
 #: camel/providers/nntp/camel-nntp-store.c:234
 #, c-format
 msgid "Could not read greeting from %s: %s"
-msgstr ""
+msgstr "خواندن خوش‌آمد‌گویی از %s ممکن نیست: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:246
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
-msgstr ""
+msgstr "کارگزار NNTP %s کد خطای %Id را بازگرداند: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:422
 #, c-format
@@ -3676,67 +3844,82 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-
+"خطا در بازیابی گروه خبری: \n"
+"\n"
+"%s"
 #: camel/providers/nntp/camel-nntp-store.c:905
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
+"شما امکان آبونه شدن در این گروه خبری را ندارید: \n"
+"\n"
+"چنین گروه خبری‌ای وجود ندارد. مورد انتخاب شده احتمالاً یک پوشه‌ی پدر می‌باشد."
 
 #: camel/providers/nntp/camel-nntp-store.c:937
+#, fuzzy
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
+"شما امکان خارج شدن از آبونه‌ی این گروه خبری را ندارید:\n"
+"گروه خبری موجود کارگزار!"
 
 #: camel/providers/nntp/camel-nntp-store.c:962
+#, fuzzy
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
+msgstr "شما امکان  ایجاد پوشه در یک News store را ندارید. به جای آن آبونه‌ی آن شوید"
 
 #: camel/providers/nntp/camel-nntp-store.c:970
+#, fuzzy
 msgid "You cannot rename a folder in a News store."
-msgstr ""
+msgstr "شما امکان تغییر نام پوشه در یک News store را ندارید."
 
 #: camel/providers/nntp/camel-nntp-store.c:978
+#, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
+msgstr "شما امکان حذف پوشه در یک News store را ندارید: به جای آن از آبونه خارج شوید. "
 
 #: camel/providers/nntp/camel-nntp-store.c:1148
-#, fuzzy
 msgid "Authentication requested but no username provided"
-msgstr "تأیید هویت لازم است"
+msgstr "تأیید هویت درخواست شده اما شناسه‌ی کاربری در‌ اختیار قرار داده نشده است "
+
+#: camel/providers/nntp/camel-nntp-store.c:1156
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "لطفاً گذرواژه‌ی NNTP را برای %s@%s وارد کنید"
 
 #: camel/providers/nntp/camel-nntp-store.c:1160
 #, c-format
 msgid "Cannot authenticate to server: %s"
-msgstr ""
+msgstr "تشخیص هویت برای کارگزار امکان‌پذیر نیست: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:1276
 #, c-format
 msgid "NNTP Command failed: %s"
-msgstr ""
+msgstr "فرمان NNTP شکست خورد: %s"
 
 #: camel/providers/nntp/camel-nntp-store.c:1332
 msgid "Not connected."
-msgstr ""
+msgstr "اتصال برقرار نیست."
 
 #: camel/providers/nntp/camel-nntp-store.c:1385
 #, c-format
 msgid "No such folder: %s"
-msgstr ""
+msgstr "چنین پوشه‌ای وجود ندارد: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:221
 #: camel/providers/nntp/camel-nntp-summary.c:317
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr ""
+msgstr "%s: در حال پویش پیغام‌های جدید"
 
 #: camel/providers/nntp/camel-nntp-summary.c:228
 #, c-format
 msgid "Unexpected server response from xover: %s"
-msgstr ""
+msgstr "پاسخ غیرمنتظره‌ی کارگزار از xover: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:331
 #, c-format
@@ -3745,7 +3928,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:371
 msgid "Use cancel"
-msgstr ""
+msgstr "انصراف استفاده شود"
 
 #: camel/providers/nntp/camel-nntp-summary.c:373
 #, c-format
@@ -3759,31 +3942,27 @@ msgstr "در حال بازیابی خلاصه‌ی POP"
 #: camel/providers/pop3/camel-pop3-folder.c:266
 #, c-format
 msgid "Cannot get POP summary: %s"
-msgstr ""
+msgstr "گرفتن خلاصه POP امکان‌پذیر نیست: %s"
 
 #: camel/providers/pop3/camel-pop3-folder.c:309
 msgid "Expunging deleted messages"
-msgstr ""
+msgstr "زدودن پیغام‌های حذف شده"
 
 #: camel/providers/pop3/camel-pop3-folder.c:405
 #, c-format
 msgid "No message with uid %s"
-msgstr ""
+msgstr "پیغامی با شناسه کاربری %s وجود ندارد"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
 #: camel/providers/pop3/camel-pop3-folder.c:412
 #, c-format
 msgid "Retrieving POP message %d"
-msgstr ""
+msgstr "در حال بازیابی پیغام %Id POP"
 
 #: camel/providers/pop3/camel-pop3-folder.c:502
 msgid "Unknown reason"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
-msgstr ""
+msgstr "دلیل نامعلوم"
 
 #: camel/providers/pop3/camel-pop3-provider.c:41
 msgid "Leave messages on server"
@@ -3796,7 +3975,7 @@ msgstr "حذف پس از %s روز"
 
 #: camel/providers/pop3/camel-pop3-provider.c:47
 msgid "Disable support for all POP3 extensions"
-msgstr ""
+msgstr "از کار انداختن پشتیبانی برای تمام پسوندهای POP3"
 
 #: camel/providers/pop3/camel-pop3-provider.c:55
 msgid "POP"
@@ -3804,14 +3983,14 @@ msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:57
 msgid "For connecting to and downloading mail from POP servers."
-msgstr "برای اتصاب و بارگیری نامه از کارگزارهای POP"
+msgstr "برای اتصال و بارگیری نامه از کارگزارهای POP‎."
 
 #: camel/providers/pop3/camel-pop3-provider.c:74
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"این گزینه با استفاده از یک گذرواژه‌ی متن ساده به کارگزار POP متصل خواهد شد. "
+"این گزینه با استفاده از یک گذرواژه‌ی متنی ساده به کارگزار POP متصل خواهد شد. "
 "این تنها گزینه‌ی پشتیبانی شده برای بسیاری از کارگزارهای POP است."
 
 #: camel/providers/pop3/camel-pop3-provider.c:84
@@ -3820,11 +3999,13 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
+"این گزینه با استفاده از گذرواژه‌ی رمزبندی شده از طریق قرارداد APOP به کارگزار POP متصل می‌شود."
+"ممکن است این روش برای همه‌ی کاربران قابل استفاده نباشد، حتی در کارگزارهایی که ادعای پشتیبانی آن را دارند."
 
 #: camel/providers/pop3/camel-pop3-store.c:204
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "تأیید هویت در کارگزار POP %s شکست خورد: %s"
+msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:218
 #: camel/providers/pop3/camel-pop3-store.c:235
@@ -3832,17 +4013,16 @@ msgstr "تأیید هویت در کارگزار POP %s شکست خورد: %s"
 #: camel/providers/pop3/camel-pop3-store.c:251
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr ""
+msgstr "اتصال به کارگزار  %s POP در حالت امن شکست خورد: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:219
-#, fuzzy
 msgid "STLS not supported"
-msgstr "پروتکل پشتیبانی نمی‌شود"
+msgstr "STLS پشتیبانی نمی‌شود"
 
 #: camel/providers/pop3/camel-pop3-store.c:363
 #, c-format
 msgid "Could not connect to POP server %s"
-msgstr "اتصال به کارگزار POP %s ممکن نیست"
+msgstr "اتصال به کارگزار %s POP ممکن نیست"
 
 #: camel/providers/pop3/camel-pop3-store.c:404
 #: camel/providers/pop3/camel-pop3-store.c:518
@@ -3852,10 +4032,12 @@ msgid ""
 "mechanism."
 msgstr ""
 
+"اتصال به کارگزار %s POP امکان پذیر نیست: پشتیبانی برای سازوکار تشخیص هویت درخواست شده وجود ندارد."
 #: camel/providers/pop3/camel-pop3-store.c:420
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
+"ورود به سیستم SASL «%s»‎ برای کارگزار %s POP شکست خورد: %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:432
 #, c-format
@@ -3870,7 +4052,7 @@ msgstr "تأیید هویت در کارگزار POP %s شکست خورد: %s"
 #: camel/providers/pop3/camel-pop3-store.c:477
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
-msgstr ""
+msgstr "%s لطفاُ گذرواژه‌ی POP برای %s بر روی میزبان %s را وارد کنید"
 
 #: camel/providers/pop3/camel-pop3-store.c:532
 #: camel/providers/pop3/camel-pop3-store.c:545
@@ -3879,20 +4061,21 @@ msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
-
+"اتصال به کارگزار %sPOP امکان پذیر نیست.\n"
+"خطا در ارسال گذرواژه: %s"
 #: camel/providers/pop3/camel-pop3-store.c:539
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 msgstr ""
-"اتصال به کارگزار POP %s امکان پذیر نیست.\n"
+"اتصال به کارگزار %sPOP امکان پذیر نیست.\n"
 "خطا در ارسال نام کاربر: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:644
+#: camel/providers/pop3/camel-pop3-store.c:645
 #, c-format
 msgid "No such folder `%s'."
-msgstr "پوشه‌ای به نام '%s' وجود ندارد"
+msgstr "پوشه‌ای به نام «%s» وجود ندارد"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
 msgid "Sendmail"
@@ -3902,7 +4085,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
+msgstr "برای تحویل نامه از طریق فرستادن آن به برنامه‌ی «sendmail» بر روی سیستم محلی."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:114
 msgid "Could not parse recipient list"
@@ -3926,7 +4109,7 @@ msgstr "ارسال پیغام ممکن نیست: %s"
 #: camel/providers/sendmail/camel-sendmail-transport.c:234
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr ""
+msgstr "sendmail با علامت %s خارج شد: نامه ارسال نشد"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
@@ -3936,7 +4119,7 @@ msgstr "اجرای %s ممکن نیست: نامه ارسال نشد."
 #: camel/providers/sendmail/camel-sendmail-transport.c:246
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr ""
+msgstr "sendmail با وضعیت %Id خارج شد: نامه ارسال نشد."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:260
 msgid "sendmail"
@@ -3944,23 +4127,24 @@ msgstr "sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:262
 msgid "Mail delivery via the sendmail program"
-msgstr ""
+msgstr "ارسال نامه از طریق برنامه‌ی sendmail"
 
 #: camel/providers/smtp/camel-smtp-provider.c:38
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:40
+#, fuzzy
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
+msgstr "برای رساندن نامه از طریق اتصال به mailhub دوردست با استفاده از SMTP"
 
 #: camel/providers/smtp/camel-smtp-transport.c:165
 msgid "Syntax error, command unrecognized"
-msgstr "خطای نحوی، فرمان شناخته نشد."
+msgstr "خطای نحوی، فرمان شناخته نشد"
 
 #: camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error in parameters or arguments"
-msgstr "خطای نحور در پارامترها و آرگومان‌ها"
+msgstr "خطای نحوی در پارامترها یا آرگومان‌ها"
 
 #: camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Command not implemented"
@@ -3980,7 +4164,7 @@ msgstr "پیغام راهنما"
 
 #: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Service ready"
-msgstr "سرپیس آماده است"
+msgstr "سرویس آماده است"
 
 #: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Service closing transmission channel"
@@ -3992,7 +4176,7 @@ msgstr "سرویس موجود نیست، کانال مخابره بسته می
 
 #: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "Requested mail action okay, completed"
-msgstr ""
+msgstr "عمل پست درخواست شده درست است، انجام شد"
 
 #: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "User not local; will forward to <forward-path>"
@@ -4000,43 +4184,43 @@ msgstr "کاربر محلی نیست؛ به <مسیر-ارجاع> ارجاع خ
 
 #: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr ""
+msgstr "عمل پست درخواست شده انجام نشد: جعبه نامه قابل دسترسی نیست"
 
 #: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Requested action not taken: mailbox unavailable"
-msgstr ""
+msgstr "عمل درخواست شده انجام نشد: جعبه نامه قابل دسترسی نیست "
 
 #: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Requested action aborted: error in processing"
-msgstr ""
+msgstr "عمل درخواست شده قطع شد: خطا در حال پردازش است"
 
 #: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "User not local; please try <forward-path>"
-msgstr ""
+msgstr "کاربر محلی نیست؛ لطفاً <مسیر-ارجاع> را امتحان کنید"
 
 #: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "Requested action not taken: insufficient system storage"
-msgstr ""
+msgstr "عمل درخواست شده انجام نشد: حافظه‌ی سیستم کافی نیست"
 
 #: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action aborted: exceeded storage allocation"
-msgstr ""
+msgstr "عمل پست درخواست شده قطع شد: تجاوز از حافظه‌ی تخصیص یافته"
 
 #: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr ""
+msgstr "عمل درخواست شده انجام نشد: نام جعبه‌ی نامه مجاز نیست"
 
 #: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Start mail input; end with <CRLF>.<CRLF>"
-msgstr ""
+msgstr "شروع ورود نامه؛ پایان با <CRLF>.<CRLF>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "Transaction failed"
-msgstr ""
+msgstr "تراکنش شکست خورد"
 
 #: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "A password transition is needed"
-msgstr "انتقال گذرواژه لازم است"
+msgstr "گذار گذرواژه لازم است"
 
 #: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Authentication mechanism is too weak"
@@ -4059,28 +4243,28 @@ msgstr "خطا در پاسخ خوش‌آمد"
 #: camel/providers/smtp/camel-smtp-transport.c:364
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "اتصال به کارگزار SMTP %s در حالت امن شکست خورد: %s"
+msgstr "اتصال به کارگزار  %s SMTP در حالت امن شکست خورد: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:334
 #, c-format
 msgid "STARTTLS command failed: %s"
-msgstr ""
+msgstr "فرمان STARTTLS شکست خورد: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:349
 msgid "STARTTLS command failed"
-msgstr ""
+msgstr "فرمان STARTTLS شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:488
+#: camel/providers/smtp/camel-smtp-transport.c:491
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr ""
+msgstr "کارگزار %s SMTP تشخیص هویت درخواست شده‌ی نوع %s را پشتیبانی نمی‌کند."
 
-#: camel/providers/smtp/camel-smtp-transport.c:526
+#: camel/providers/smtp/camel-smtp-transport.c:529
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sلطفاْ گذرواژه‌ی SMTP برای %s در میزبان %s را وارد کنید"
 
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:548
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4091,93 +4275,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:672
 #, c-format
 msgid "SMTP server %s"
-msgstr "کارگزار SMTP %s"
+msgstr "کارگزار %s SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:671
+#: camel/providers/smtp/camel-smtp-transport.c:674
 #, c-format
 msgid "SMTP mail delivery via %s"
-msgstr ""
+msgstr "تحویل نامه‌ی SMTP از طریق %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:689
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: service not connected."
-msgstr "ارسال پیغام ممکن نیست: سرویس متصل نیست."
+msgstr "نمی‌توان پیغام را ارسال کرد: سرویس متصل نیست."
 
-#: camel/providers/smtp/camel-smtp-transport.c:695
+#: camel/providers/smtp/camel-smtp-transport.c:698
 msgid "Cannot send message: sender address not valid."
-msgstr "ارسال پیغام ممکن نیست: نشانی فرستنده معتبر نیست."
+msgstr "نمی‌توان پیغام را ارسال کرد: نشانی فرستنده معتبر نیست."
 
-#: camel/providers/smtp/camel-smtp-transport.c:699
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Sending message"
 msgstr "در حال ارسال پیغام"
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Cannot send message: no recipients defined."
-msgstr "ارسال پیغام ممکن نیست: گیرنده‌ای معین نشده است."
+msgstr "نمی‌توان پیغام را ارسال کرد: گیرنده‌ای معین نشده است."
 
-#: camel/providers/smtp/camel-smtp-transport.c:725
+#: camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "ارسال پیغام ممکن نیست: دست کم یکی از گیرنده‌ها معتبر نیستند"
+msgstr "نمی‌توان پیغام را ارسال کرد: دست کم یکی از گیرنده‌ها معتبر نیست"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:897
+#, fuzzy
 msgid "SMTP Greeting"
-msgstr ""
+msgstr "خوش‌آمدِ SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:923
 #, c-format
 msgid "HELO command failed: %s"
-msgstr ""
+msgstr "فرمان HELO شکست خورد: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:940
 msgid "HELO command failed"
 msgstr "فرمان HELO شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1003
+#: camel/providers/smtp/camel-smtp-transport.c:1006
 msgid "SMTP Authentication"
 msgstr "تأیید هویت SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1009
+#: camel/providers/smtp/camel-smtp-transport.c:1012
 msgid "Error creating SASL authentication object."
-msgstr ""
+msgstr "خطا در ایجاد شیء تشخیص هویت SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
-#: camel/providers/smtp/camel-smtp-transport.c:1037
+#: camel/providers/smtp/camel-smtp-transport.c:1029
+#: camel/providers/smtp/camel-smtp-transport.c:1040
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "فرمان AUTH شکست خورد: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1046
 msgid "AUTH command failed"
 msgstr "فرمان AUTH شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1105
+#: camel/providers/smtp/camel-smtp-transport.c:1108
 msgid "Bad authentication response from server.\n"
-msgstr ""
+msgstr ".پاسخ تأیید هویت نامناسب از کارگزار \n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1133
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr ""
+msgstr "فرمان MAIL FROM شکست خورد: %s: نامه ارسال نشد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
+#: camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "MAIL FROM command failed"
-msgstr ""
+msgstr "فرمان MAIL FROM شکست خورد "
 
-#: camel/providers/smtp/camel-smtp-transport.c:1171
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
-msgstr ""
+msgstr "فرمان RCPT TO شکست خورد: %s :نامه ارسال نشد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1193
 #, c-format
 msgid "RCPT TO <%s> failed"
-msgstr ""
+msgstr "RCPT TO <%s> شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1229
-#: camel/providers/smtp/camel-smtp-transport.c:1287
-#: camel/providers/smtp/camel-smtp-transport.c:1306
+#: camel/providers/smtp/camel-smtp-transport.c:1232
+#: camel/providers/smtp/camel-smtp-transport.c:1290
+#: camel/providers/smtp/camel-smtp-transport.c:1309
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "فرمان DATA شکست خورد: %s: نامه ارسال نشد"
@@ -4185,106 +4370,316 @@ msgstr "فرمان DATA شکست خورد: %s: نامه ارسال نشد"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1246
-#: camel/providers/smtp/camel-smtp-transport.c:1322
+#: camel/providers/smtp/camel-smtp-transport.c:1249
+#: camel/providers/smtp/camel-smtp-transport.c:1325
 msgid "DATA command failed"
 msgstr "فرمان DATA شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1348
 #, c-format
 msgid "RSET command failed: %s"
-msgstr "فرمانRSET شکست خورد: %s"
+msgstr "فرمان RSET شکست خورد: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1361
+#: camel/providers/smtp/camel-smtp-transport.c:1364
 msgid "RSET command failed"
 msgstr "فرمان RSET شکست خورد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1387
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "فرمان QUIT شکست خورد: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1401
 msgid "QUIT command failed"
 msgstr "فرمان QUIT شکست خورد"
 
-#: libedataserverui/e-categories-dialog.c:90
-#, fuzzy
+#: libedataserver/e-categories.c:227
+msgid "Business"
+msgstr "کاری"
+
+#: libedataserver/e-categories.c:228
+msgid "Competition"
+msgstr "رقابت" 
+
+#: libedataserver/e-categories.c:229
+msgid "Favorites"
+msgstr "محبوب‌ها"
+
+#: libedataserver/e-categories.c:230
+msgid "Gifts"
+msgstr ""
+
+#: libedataserver/e-categories.c:231
+msgid "Goals/Objectives"
+msgstr ""
+
+#: libedataserver/e-categories.c:232
+msgid "Holiday"
+msgstr "تعطیلات"
+
+#: libedataserver/e-categories.c:233
+msgid "Holiday Cards"
+msgstr "کارت‌های تعطیلات"
+
+#: libedataserver/e-categories.c:234
+msgid "Hot Contacts"
+msgstr "آشناهای مهم "
+
+#: libedataserver/e-categories.c:235
+msgid "Ideas"
+msgstr "‌ایده‌ها"
+
+#: libedataserver/e-categories.c:236
+msgid "International"
+msgstr ""
+
+#: libedataserver/e-categories.c:237
+msgid "Key Customer"
+msgstr "مشتریِ کلیدی"
+
+#: libedataserver/e-categories.c:238
+msgid "Miscellaneous"
+msgstr "متفرقه"
+
+#: libedataserver/e-categories.c:239
+msgid "Personal"
+msgstr "شخصی"
+
+#: libedataserver/e-categories.c:240
+msgid "Phone Calls"
+msgstr "تماس‌های تلفنی"
+
+#: libedataserver/e-categories.c:241
+msgid "Status"
+msgstr "وضعیت"
+
+#: libedataserver/e-categories.c:242
+msgid "Strategies"
+msgstr "راهکارها"
+
+#: libedataserver/e-categories.c:243
+msgid "Suppliers"
+msgstr "تأمين‌کننده‌گان"
+
+#: libedataserver/e-categories.c:244
+msgid "Time & Expenses"
+msgstr "زمان و هزینه‌ها"
+
+#: libedataserver/e-categories.c:245
+msgid "VIP"
+msgstr "شخص بسیار مهم"
+
+#: libedataserver/e-categories.c:246
+msgid "Waiting"
+msgstr "در حال انتظار"
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: libedataserver/e-time-utils.c:173 libedataserver/e-time-utils.c:400
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: libedataserver/e-time-utils.c:178 libedataserver/e-time-utils.c:391
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: libedataserver/e-time-utils.c:183 libedataserver/e-time-utils.c:396
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr ""
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: libedataserver/e-time-utils.c:188 libedataserver/e-time-utils.c:387
+msgid "%a %m/%d/%Y %H:%M"
+msgstr ""
+
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: libedataserver/e-time-utils.c:193
+msgid "%a %m/%d/%Y %I %p"
+msgstr ""
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: libedataserver/e-time-utils.c:198
+msgid "%a %m/%d/%Y %H"
+msgstr ""
+
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
+#: libedataserver/e-time-utils.c:201 libedataserver/e-time-utils.c:294
+#: libedataserver/e-time-utils.c:382
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. strptime format of a date and a time, in 12-hour format.
+#: libedataserver/e-time-utils.c:209
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#. strptime format of a date and a time, in 24-hour format.
+#: libedataserver/e-time-utils.c:213
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr ""
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: libedataserver/e-time-utils.c:218
+msgid "%m/%d/%Y %I:%M %p"
+msgstr ""
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: libedataserver/e-time-utils.c:223
+msgid "%m/%d/%Y %H:%M"
+msgstr ""
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: libedataserver/e-time-utils.c:228
+msgid "%m/%d/%Y %I %p"
+msgstr ""
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: libedataserver/e-time-utils.c:233
+msgid "%m/%d/%Y %H"
+msgstr ""
+
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#: libedataserver/e-time-utils.c:236 libedataserver/e-time-utils.c:297
+msgid "%m/%d/%Y"
+msgstr ""
+
+#. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
+#: libedataserver/e-time-utils.c:337 libedataserver/e-time-utils.c:436
+msgid "%I:%M:%S %p"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
+#: libedataserver/e-time-utils.c:341 libedataserver/e-time-utils.c:428
+msgid "%H:%M:%S"
+msgstr ""
+
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: libedataserver/e-time-utils.c:346 libedataserver/e-time-utils.c:433
+msgid "%I:%M %p"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: libedataserver/e-time-utils.c:350 libedataserver/e-time-utils.c:425
+msgid "%H:%M"
+msgstr ""
+
+#. strptime format for hour and AM/PM, 12-hour format.
+#: libedataserver/e-time-utils.c:354
+msgid "%I %p"
+msgstr ""
+
+#: libedataserverui/e-categories-dialog.c:91
 msgid "Category Icon"
-msgstr "مقوله‌ی"
+msgstr "شمایل مقوله"
 
-#: libedataserverui/e-categories-dialog.c:236
+#: libedataserverui/e-categories-dialog.c:237
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
-msgstr ""
+msgstr "کماکان مقوله‌ی «%s» در پیکربندی وجود دارد. لطفاً از یکی دیگر استفاده کنید"
 
-#: libedataserverui/e-categories-dialog.c:391
-#, fuzzy
+#: libedataserverui/e-categories-dialog.c:395
 msgid "Category"
-msgstr "_مقوله:"
+msgstr "مقوله:"
 
 #: libedataserverui/e-categories-dialog.glade.h:1
-#, fuzzy
 msgid "Category Properties"
-msgstr "مقوله‌ی"
+msgstr "ویژگی‌های مقوله"
 
 #: libedataserverui/e-categories-dialog.glade.h:2
-#, fuzzy
 msgid "Category _Color"
-msgstr "مقوله‌ی"
+msgstr "_رنگ مقوله"
 
 #: libedataserverui/e-categories-dialog.glade.h:3
-#, fuzzy
 msgid "Category _Icon"
-msgstr "مقوله‌ی"
+msgstr "_شمایل مقوله"
 
 #: libedataserverui/e-categories-dialog.glade.h:4
-#, fuzzy
 msgid "Category _Name"
-msgstr "مقوله‌ی"
+msgstr "_نام مقوله"
 
 #: libedataserverui/e-categories-dialog.glade.h:5
-#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr "این آشنا به این مقولات تعلق دارد:"
+msgstr "این مورد(ها) به این _مقولات تعلق دارد:"
 
 #: libedataserverui/e-categories-dialog.glade.h:6
-#, fuzzy
 msgid "_Available Categories:"
-msgstr "م_قولات"
+msgstr "م_قولات موجود:"
 
 #: libedataserverui/e-categories-dialog.glade.h:7
 msgid "_Edit"
 msgstr "_ویرایش"
 
 #: libedataserverui/e-categories-dialog.glade.h:8
-#, fuzzy
 msgid "categories"
-msgstr "مقولات"
+msgstr "مقوله"
 
-#: libedataserverui/e-name-selector-dialog.c:184
+#: libedataserverui/e-name-selector-dialog.c:200
 msgid "Select Contacts from Address Book"
 msgstr "آشنا‌ها را از دفترچه‌ی نشانی انتخاب کنید"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "\t\t\t\t\t\t"
+msgstr "\t\t\t\t\t\t"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:2
-msgid "<b>Contacts</b>"
-msgstr "<b>آشنا‌ها</b>"
+msgid "*"
+msgstr "*"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:3
 msgid "<b>Show Contacts</b>"
 msgstr "<b>نشان دادن آشنا‌ها</b>"
 
 #: libedataserverui/e-name-selector-dialog.glade.h:4
+msgid "<b>_Contacts</b>"
+msgstr "<b>آ_شنا‌ها</b>"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:5
+msgid "Address Book"
+msgstr "دفترچه‌ی نشانی"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:6
 msgid "Address _Book:"
 msgstr "_دفترچه‌ی نشانی:"
 
-#: libedataserverui/e-name-selector-dialog.glade.h:5
+#: libedataserverui/e-name-selector-dialog.glade.h:7
+msgid "Contacts"
+msgstr "آشنا‌ها"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:8
+msgid "Search"
+msgstr "جست و جو"
+
+#: libedataserverui/e-name-selector-dialog.glade.h:9
 msgid "_Search:"
 msgstr "_جست و جو:"
 
@@ -4297,28 +4692,64 @@ msgstr "انتخاب مقصد"
 msgid "_Destination"
 msgstr "م_قصد"
 
-#: servers/groupwise/e-gw-connection.c:152
+#: servers/groupwise/e-gw-connection.c:157
 msgid "Invalid connection"
-msgstr ""
+msgstr "اتصال نامعتبر"
 
-#: servers/groupwise/e-gw-connection.c:156
+#: servers/groupwise/e-gw-connection.c:161
 msgid "Invalid response from server"
-msgstr ""
+msgstr "پاسخ نامعتبر از کارگزار"
 
-#: servers/groupwise/e-gw-connection.c:162
+#: servers/groupwise/e-gw-connection.c:163
+msgid "No response from the server"
+msgstr "پاسخی از کارگزار دریافت نشد"
+
+#: servers/groupwise/e-gw-connection.c:169
 msgid "Bad parameter"
-msgstr ""
+msgstr "پارامتر نامناسب"
 
 #: src/GNOME_Evolution_DataServer.server.in.in.h:1
 msgid "Evolution Addressbook file backend"
-msgstr ""
+msgstr "پسانه‌ی پرونده‌ی دفترچه‌ی نشانی Evolution"
 
 #: src/GNOME_Evolution_DataServer.server.in.in.h:2
 msgid "Evolution Calendar file and webcal backend"
-msgstr ""
+msgstr "پرونده‌ی تقویم و پسانه‌ی تقویمِ وبی Evolution"
 
 #. dialog display isn't working out
 #: src/server.c:101
 #, c-format
 msgid "Multiple segmentation faults occurred; can't display error dialog\n"
-msgstr ""
+msgstr "نقص‌های قطعه‌بندی متعددی رخ داد؛ نمی‌توان محاوره‌ی خطا را نمایش داد\n"
+
+#~ msgid "File As"
+#~ msgstr "پرونده به نام"
+
+#, fuzzy
+#~ msgid "Repository is Offline"
+#~ msgstr "مخزن منفصل است"
+
+#~ msgid "Address Book and Calendar"
+#~ msgstr "دفترچه‌ی نشانی و تقویم"
+
+#~ msgid "Post Office Agent:"
+#~ msgstr "مأمور اداره‌ی پست:"
+
+#~ msgid "Use Secure Connection (SSL)"
+#~ msgstr "استفاده از اتصال امن (SSL)"
+
+#~ msgid "Tasks"
+#~ msgstr "تکلیف‌ها"
+
+#, fuzzy
+#~ msgid "Checklist"
+#~ msgstr "فهرست"
+
+#~ msgid "%sEnter password for %s (user %s)"
+#~ msgstr "%s گذرواژه‌ی برای %s (کاربر %s) را وارد کنید"
+
+#~ msgid "Failed to authenticate.\n"
+#~ msgstr "تأیید هویت شکست خورد.\n"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "ارسال نام کاربر به کارگزار شکست خورد"
-- 
2.7.4